Merge pull request #94 from linkedconnections/development

v1.4.0

Author: julianrojas87

bin/datasets

@@ -3,10 +3,9 @@
 /**
  * Module dependencies.
  */
-const DataserManager = require('../lib/manager/dataset_manager');
+import { DatasetManager } from '../lib/manager/dataset_manager.js';
 
 /**
  * Start dataset managing process
  */
-var manager = new DataserManager();
-manager.manage();
+new DatasetManager().manage();

bin/web-server

@@ -3,26 +3,28 @@
 /**
  * Module dependencies.
  */
-const debug = require('debug')('linked-connections-server:server');
-const http = require('http');
-const app = require('../lib/server');
-const utils = require('../lib/utils/utils');
 
-const server_config = utils.serverConfig;
+import debug from 'debug';
+import http from 'http';
+import app from '../lib/server.js';
+import { Utils } from '../lib/utils/utils.js';
 
+const utils = new Utils();
+const dbgr = debug('linked-connections-server:server');
+const server_config = utils.serverConfig;
 
 /**
  * Get port from environment and store in Express.
  */
 
-var port = normalizePort(process.env.PORT || server_config.port);
+const port = normalizePort(process.env.PORT || server_config.port);
 app.set('port', port);
 
 /**
  * Create HTTP server.
  */
 
-var server = http.createServer(app);
+const server = http.createServer(app);
 
 /**
  * Listen on provided port, on all network interfaces.
@@ -37,7 +39,7 @@ server.on('listening', onListening);
  */
 
 function normalizePort(val) {
-  var port = parseInt(val, 10);
+  const port = parseInt(val, 10);
 
   if (isNaN(port)) {
     // named pipe
@@ -89,5 +91,5 @@ function onListening() {
   var bind = typeof addr === 'string'
     ? 'pipe ' + addr
     : 'port ' + addr.port;
-  debug('Listening on ' + bind);
+  dbgr('Listening on ' + bind);
 }

lib/data/connections.js

@@ -1,16 +1,17 @@
-const fs = require('fs');
-const util = require('util');
-const watch = require('node-watch');
-const cron = require('cron');
-const utils = require('../utils/utils');
-const AVLTree = require('../utils/avl-tree');
-const Logger = require('../utils/logger');
-
+import fs from 'fs';
+import util from 'util';
+import watch from 'node-watch';
+import { CronJob } from 'cron';
+import { Utils } from '../utils/utils.js';
+import { getLogger } from '../utils/logger.js';
+import { AVLTree } from '../utils/avl-tree.js';
+
+const utils = new Utils();
 const writeFile = util.promisify(fs.writeFile);
 const readFile = util.promisify(fs.readFile);
-const logger = Logger.getLogger(utils.serverConfig.logLevel || 'info');
+const logger = getLogger(utils.serverConfig.logLevel || 'info');
 
-class Connections {
+export class Connections {
     constructor(options) {
         this._agency = options['agency'];
         this._staticData = options['staticData'];
@@ -71,16 +72,17 @@ class Connections {
             }
 
             // Setup a cron job to recreate the tree every 10 minutes and shift its time window
-            let recreateTree = new cron.CronJob({
-                cronTime: '0 */10 * * * *', // TODO: make this configurable
-                onTick: () => {
+            const recreateTree = new CronJob(
+                '0 */10 * * * *', // TODO: make this configurable
+                () => {
                     this.recreateJob.stop();
                     if (this.watcher) this.watcher.close();
                     logger.info(`Recreating AVL tree for ${this.agency}...`);
                     this.init();
                 },
-                start: true
-            });
+                null,
+                true
+            );
 
             this.recreateJob = recreateTree;
         } catch (err) {
@@ -207,6 +209,4 @@ class Connections {
     set latestVersion(newVersion) {
         this._latestVersion = newVersion;
     }
-}
-
-module.exports = Connections;
+}

lib/data/real-time.js

@@ -1,6 +1,5 @@
 const fs = require('fs');
 const util = require('util');
-const utils = require('../utils/utils');
 
 const readdir = util.promisify(fs.readdir);
 

lib/data/static.js

@@ -1,10 +1,9 @@
-const fs = require('fs');
-const util = require('util');
-const utils = require('../utils/utils');
+import fs from 'fs';
+import util from 'util';
 
 const readdir = util.promisify(fs.readdir);
 
-class StaticData {
+export class StaticData {
     constructor(storage, datasets) {
         this._storage = `${storage}/linked_pages/`;
         this._datasets = datasets;
@@ -63,6 +62,4 @@ class StaticData {
     get staticFragments() {
         return this._staticFragments;
     }
-}
-
-module.exports = StaticData;
+}