Merge pull request #9 from tilfin/refactor

Refactor

Author: tilfin

README.md

@@ -6,6 +6,10 @@ Dynamic DNS API Service for Google Cloud
 This is a hub service to connect dynamic IP address endpoint as a home network at any time.
 Your DNS record on Google Cloud is updated by posting this service from Home PC periodically.
 
+## Environment
+
+Node.js 4.3 or Later
+
 ## Configuration
 Edit _config/local.yml_
 

app.js

@@ -1,8 +1,10 @@
-var config = require('config').config;
-var restify = require('restify');
-var resource = require('./resource');
+'use strict';
 
-var server = restify.createServer({
+const config = require('config').config;
+const restify = require('restify');
+const resource = require('./resource');
+
+const server = restify.createServer({
   name: 'Dynamic DNS API Service for Google Cloud'
 });
 
@@ -13,7 +15,7 @@ server.use(restify.bodyParser({ mapParams: true }));
 resource(server);
 
 if (!module.parent) {
-  var port = process.env.PORT || config.app.port;
+  const port = process.env.PORT || config.app.port;
   server.listen(port);
   console.log("Start API Service port: %d", port);
 }

bin/gc-ddns

@@ -0,0 +1,45 @@
+#!/usr/bin/env node
+
+const program = require('commander');
+const config = require('config').config;
+const record = require('../model/record');
+const GcDnsClient = require('../model/gcdns');
+const CommonUtil = require('../util/common');
+
+program
+  .command('list')
+  .description('list resource record sets')
+  .action(function(){
+    const client = new GcDnsClient();
+    client.listPromise()
+    .then(result => {
+      console.log(JSON.stringify(result, null, 2));
+    })
+    .catch(err => {
+      console.error(err);
+    });
+  });
+
+program
+  .command('register <host> <ip> [ttl]')
+  .description('register A/AAAA record')
+  .action(function(host, ip, ttl){
+    const ipVersion = CommonUtil.validateIpVersion(ip);
+    const recordType = CommonUtil.getAddressRecordType(ipVersion);
+    if (recordType == null) {
+      console.error('Invalid IP address');
+      return;
+    }
+
+    const recordTtl = parseInt(ttl || config.ttl, 10);
+    if (isNaN(recordTtl)) {
+      console.error('Invalid TTL');
+      return;
+    }
+
+    record.create(host, ip, recordType, recordTtl, function(err, result){
+      console.log(JSON.stringify(result, null, 2));
+    });
+  });
+
+program.parse(process.argv);

bin/gc-ddns.js

@@ -1,6 +1,7 @@
-var config = require('config').config.googleCloud;
-var restify = require('restify');
-var google = require('googleapis');
+'use strict';
+
+const config = require('config').config.googleCloud;
+const google = require('googleapis');
 
 
 function GcDnsClient() {
@@ -16,17 +17,16 @@ GcDnsClient.prototype = {
   },
 
   listPromise: function(host, type) {
-    var self = this;
-    return self.dnsClientPromise()
-      .then(function(dns) {
-        var params = self.baseParams();
+    return this.dnsClientPromise()
+      .then(dns => {
+        const params = this.baseParams();
         if (host) {
-          params.name = host + self.FQDNSuffix;
+          params.name = host + this.FQDNSuffix;
         }
         if (type) params.type = type;
 
-        return new Promise(function(resolve, reject) {
-            dns.resourceRecordSets.list(params, function(err, resp) {
+        return new Promise((resolve, reject) => {
+            dns.resourceRecordSets.list(params, (err, resp) => {
               if (err) {
                 reject(err);
               } else {
@@ -38,18 +38,17 @@ GcDnsClient.prototype = {
   },
 
   createPromise: function(host, ip, recordType, ttl, existing) {
-    var self = this;
-    return self.dnsClientPromise()
-      .then(function(dns) {
-        var resRecordSet = {
+    return this.dnsClientPromise()
+      .then(dns => {
+        const resRecordSet = {
           kind: 'dns#resourceRecordSet',
-          name: host + self.FQDNSuffix,
+          name: host + this.FQDNSuffix,
           type: recordType,
           rrdatas: [ip],
           ttl: ttl
         };
 
-        var params = self.baseParams();
+        const params = this.baseParams();
         params.resource = {
           kind: 'dns#change',
           additions: [resRecordSet],
@@ -59,7 +58,7 @@ GcDnsClient.prototype = {
           params.resource.deletions = [existing];
         }
 
-        return new Promise(function(resolve, reject) {
+        return new Promise((resolve, reject) => {
             dns.changes.create(params, function(err, resp) {
               if (err) {
                 reject(err);
@@ -76,23 +75,22 @@ GcDnsClient.prototype = {
       return Promise.resolve(this.dnsClient);
     }
 
-    var self = this;
-    return new Promise(function(resolve, reject) {
-        var API_SCOPES = [
+    return new Promise((resolve, reject) => {
+        const API_SCOPES = [
           'https://www.googleapis.com/auth/ndev.clouddns.readwrite',
           'https://www.googleapis.com/auth/cloud-platform'
         ];
 
-        var key = require(config.authKeyJsonFile);
+        const key = require(config.authKeyJsonFile);
 
-        var jwtClient = new google.auth.JWT(key.client_email, null, key.private_key, API_SCOPES, null);
-        jwtClient.authorize(function(err, tokens) {
+        const jwtClient = new google.auth.JWT(key.client_email, null, key.private_key, API_SCOPES, null);
+        jwtClient.authorize((err, tokens) => {
           if (err) {
             reject(err);
           } else {
             google.options({ auth: jwtClient });
-            self.dnsClient = google.dns('v1');
-            resolve(self.dnsClient);
+            this.dnsClient = google.dns('v1');
+            resolve(this.dnsClient);
           }
         });
       });

model/gcdns.js

@@ -1,25 +1,27 @@
-var restify = require('restify');
-var GcDnsClient = require('../model/gcdns');
+'use strict';
+
+const restify = require('restify');
+const GcDnsClient = require('../model/gcdns');
 
 
 exports.create = function(host, ip, recordType, ttl, callback) {
-  var client = new GcDnsClient();
+  const client = new GcDnsClient();
   client.listPromise(host, recordType)
-  .then(function(resp) {
+  .then(resp => {
     return (resp.rrsets.length == 1) ? resp.rrsets[0] : null;
   })
-  .then(function(existingRecord) {
+  .then(existingRecord => {
     if (existingRecord && existingRecord.rrdatas[0] == ip) {
       return {
           message: 'IP address is unchanged.'
         };
     }
     return client.createPromise(host, ip, recordType, ttl, existingRecord);
   })
-  .then(function(resp) {
+  .then(resp => {
     callback(null, resp);
   })
-  .catch(function(err) {
+  .catch(err => {
     console.log(err);
     console.log(err.stack);
     callback(err);

model/record.js

@@ -1,10 +1,10 @@
 {
   "name": "gc-ddns",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Dynamic DNS API Service for Google Cloud",
   "main": "app.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "node app.js"
   },
   "repository": {
     "type": "git",
@@ -22,13 +22,14 @@
   },
   "homepage": "https://github.com/tilfin/gc-ddns#readme",
   "dependencies": {
-    "commander": "^2.8.1",
-    "config": "^1.15.0",
-    "googleapis": "^2.1.3",
-    "js-yaml": "^3.3.1",
-    "restify": "^4.0.0"
+    "commander": "^2.9.0",
+    "config": "^1.21.0",
+    "googleapis": "^2.1.7",
+    "js-yaml": "^3.6.1",
+    "restify": "^4.1.1"
   },
-  "bin": {
-    "gc-ddns": "gc-ddns.js"
+  "bin": "./bin/gc-ddns",
+  "engines": {
+    "node": ">=4.3.0"
   }
 }

package.json

@@ -1,4 +1,6 @@
-var record = require('./record');
+'use strict';
+
+const record = require('./record');
 
 module.exports = function(server) {
   server.post('/records', record.post);

resource/index.js

@@ -1,11 +1,13 @@
-var restify = require('restify');
-var config = require('config').config;
-var CommonUtil = require('../util/common');
-var record = require('../model/record');
+'use strict';
+
+const restify = require('restify');
+const config = require('config').config;
+const CommonUtil = require('../util/common');
+const record = require('../model/record');
 
 
 function authorize(req, res, next) {
-  var apiKey = req.params.key;
+  const apiKey = req.params.key;
   if (apiKey == config.app.apiKey) {
     return true;
   } else {
@@ -19,27 +21,27 @@ exports.post = function(req, res, next) {
     return;
   }
 
-  var host = req.params.host;
+  const host = req.params.host;
   if (!host) {
     next(new restify.errors.BadRequestError('Invalid host'));
     return;
   }
 
-  var ip = req.params.ip || req.headers['x-forwarded-for'] || req.connection.remoteAddress;
-  var ipVersion = CommonUtil.validateIpVersion(ip);
-  var recordType = CommonUtil.getAddressRecordType(ipVersion);
+  const ip = req.params.ip || req.headers['x-forwarded-for'] || req.connection.remoteAddress;
+  const ipVersion = CommonUtil.validateIpVersion(ip);
+  const recordType = CommonUtil.getAddressRecordType(ipVersion);
   if (recordType == null) {
     next(new restify.errors.BadRequestError('Invalid IP address'));
     return;
   }
 
-  var recordTtl = parseInt(req.params.ttl || config.ttl, 10);
+  const recordTtl = parseInt(req.params.ttl || config.ttl, 10);
   if (isNaN(recordTtl)) {
     next(new restify.errors.BadRequestError('Invalid TTL'));
     return;
   }
 
-  record.create(host, ip, recordType, recordTtl, function(err, result) {
+  record.create(host, ip, recordType, recordTtl, (err, result) => {
     if (err) {
       console.log(err);
       return next(err);

resource/record.js

@@ -1,3 +1,5 @@
+'use strict';
+
 exports.validateIpVersion = function(ip) {
   if (ip.match(/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/)) {
     return 4;