feat: add delorean es api (#6)

* Feat: use es version delores for new apis

* Fix: handle both new and old delorean

* Fix: change device check in parameters

* Fix: enable log and set timeout and deadline

* Fix: add LRU cache to device type meta key

* Fix: this.cache

* Fix: lint error

* Fix: send method returns Promise

* Fix: return promise

* Fix: delete dispose function, use shorter age to test on staging

* Fix: change logger to false

* Fix: remove LRU cache

* Fix: separate Delorean and Delorean-ES

Author: jasondu168

lib/Auth/index.js

@@ -107,7 +107,9 @@ class Auth {
       {
         headers: { 'content-type': 'application/x-www-form-urlencoded' },
         payload,
-        isPublic: true
+        isPublic: true,
+        timeout: 2000,
+        deadline: 4000
       }
     ).catch(error => {
       if (error.status === 400 && grantType === 'refresh_token') {
@@ -158,7 +160,16 @@ class Auth {
       throw this.invalidCredentials;
     }
 
-    opts = Object.assign({ headers: {}, isPublic: false, cache: false }, opts);
+    opts = Object.assign(
+      {
+        headers: {},
+        isPublic: false,
+        cache: false,
+        timeout: 60000,
+        deadline: 90000
+      },
+      opts
+    );
 
     if (!retry) {
       service = `[${service}]`;
@@ -194,6 +205,10 @@ class Auth {
         begin = new Date().getTime();
         ({ status, body } = await superagent(method, url)
           .set(opts.headers)
+          .timeout({
+            response: opts.timeout,
+            deadline: opts.deadline
+          })
           .query(opts.query)
           .send(opts.payload));
 

lib/Services/delorean-es.js

@@ -0,0 +1,96 @@
+class DeloreanES {
+  /**
+   * @param {String} url
+   * @param {typeof Auth} Auth
+   */
+  constructor(url, Auth) {
+    this.service = DeloreanES.name;
+    this.url = url;
+    this.auth = Auth;
+  }
+
+  /**
+   * get latest checkin timestamp of deviceId
+   *  sensors - get sensors or not
+   *
+   * @param {String}  userId
+   * @param {String}  deviceId
+   * @param {boolean} getSensors
+   * @param {Array}   channels
+   */
+  getDeviceCheckIn(userId, deviceId, needSensors, channels) {
+    const url = `${this.url}/devices/${deviceId}/checkin`;
+    const query = { user_id: userId, sensors: needSensors, channels: channels };
+    return this.auth.send(this.service, 'GET', url, { query });
+  }
+
+  /**
+   * @param {String}  userId
+   * @param {String}  deviceId
+   * @param {Object}  query
+   * @param {String}  query.type
+   * @param {String}  query.units
+   */
+  getDeviceState(userId, deviceId, query) {
+    const url = `${this.url}/devices/${deviceId}/state`;
+    query = { ...query, user_id: userId };
+    return this.auth.send(this.service, 'GET', url, { query });
+  }
+
+  /**
+   * @param {String}  userId
+   * @param {String}  deviceIds
+   * @param {Object}  query
+   */
+  getDevicesState(userId, deviceIds, query) {
+    const url = `${this.url}/devices/state`;
+    query = { ...query, user_id: userId, devices: deviceIds };
+    return this.auth.send(this.service, 'GET', url, { query });
+  }
+
+  /**
+   * @param {String}  userId
+   * @param {String}  deviceId
+   * @param {Object}  query
+   */
+  getDeviceTotals(userId, deviceId, query) {
+    const url = `${this.url}/devices/${deviceId}/totals`;
+    query = { ...query, user_id: userId };
+    return this.auth.send(this.service, 'GET', url, { query });
+  }
+
+  /**
+   * @param {String}  userId
+   * @param {String}  deviceId
+   * @param {Object}  query
+   */
+  getDeviceAggregations(userId, deviceId, query) {
+    const url = `${this.url}/devices/${deviceId}/aggregations`;
+    query = { ...query, user_id: userId };
+    return this.auth.send(this.service, 'GET', url, { query });
+  }
+
+  /**
+   * @param {String}  userId
+   * @param {String}  deviceId
+   * @param {Object}  query
+   */
+  getDeviceReadings(userId, deviceId, query) {
+    const url = `${this.url}/devices/${deviceId}/readings`;
+    query = { ...query, user_id: userId };
+    return this.auth.send(this.service, 'GET', url, { query });
+  }
+
+  /**
+   * @param {String}  userId
+   * @param {String}  deviceId
+   * @param {Object}  query
+   */
+  getDeviceReportReadings(userId, deviceId, query) {
+    const url = `${this.url}/devices/${deviceId}/readings/report`;
+    query = { ...query, user_id: userId };
+    return this.auth.send(this.service, 'GET', url, { query });
+  }
+}
+
+module.exports = DeloreanES;

lib/index.js

@@ -1,6 +1,7 @@
 const Auth = require('./Auth');
 const Cayenne = require('./Services/cayenne');
 const Delorean = require('./Services/delorean');
+const DeloreanES = require('./Services/delorean-es');
 const Executor = require('./Services/executor');
 const Hermes = require('./Services/hermes');
 const Prometheus = require('./Services/prometheus');
@@ -20,6 +21,7 @@ class Core {
    * @param {Object}                      options                   Additional options
    * @param {String}                      options.cayenneBaseUrl    Things URL
    * @param {String}                      options.deloreanBaseUrl   History URL
+   * @param {String}                      options.deloreanESBaseUrl History URL
    * @param {String}                      options.executorBaseUrl   Jobs URL
    * @param {String}                      options.hermesBaseUrl     Notifications URL
    * @param {String}                      options.prometheusBaseUrl Lora URL
@@ -32,9 +34,9 @@ class Core {
     options = Object.assign({ logger: false, isOffline: true }, options);
 
     this.auth = new Auth(clientId, clientSecret, authorizationUrl, options);
-
     this.cayenne = new Cayenne(options.cayenneBaseUrl, this.auth);
     this.delorean = new Delorean(options.deloreanBaseUrl, this.auth);
+    this.deloreanES = new DeloreanES(options.deloreanESBaseUrl, this.auth);
     this.executor = new Executor(options.executorBaseUrl, this.auth);
     this.hermes = new Hermes(options.hermesBaseUrl, this.auth);
     this.prometheus = new Prometheus(options.prometheusBaseUrl, this.auth);