Development

README.md

@@ -137,10 +137,11 @@ DeviceHive module
 | [options.accessToken] | <code>string</code> | Access token |
 | [options.refreshToken] | <code>string</code> | Refresh token |
 | [options.login] | <code>string</code> | Login |
-| [options.password] | <code>string</code> | Paaword |
+| [options.password] | <code>string</code> | Password |
 | options.mainServiceURL | <code>string</code> | Main Service URL |
 | [options.authServiceURL] | <code>string</code> | Auth Service URL (required only for http) |
-| [options.pluginServiceURL] | <code>string</code> | Alug inServi ceURL (required only for http) |
+| [options.pluginServiceURL] | <code>string</code> | Plugin Service URL (required only for http) |
+| [options.autoUpdateSession] | <code>boolean</code> | Flag to enable/disable autoupdating session. Default: true |
 
 <a name="DeviceHive+connect"></a>
 
@@ -2552,7 +2553,7 @@ Creates Plugin Update Query model
 | [options.returnCommands] | <code>boolean</code> | Checks if commands should be returned |
 | [options.returnUpdatedCommands] | <code>boolean</code> | Checks if updated commands should be returned |
 | [options.returnNotifications] | <code>boolean</code> | Checks if commands should be returned |
-| [options.status] | <code>string</code> | Plugin status - active or disabled (ACTIVE | DISABLED | CREATED) |
+| [options.status] | <code>string</code> | Plugin status - active or disabled (ACTIVE | INACTIVE | CREATED) |
 | [options.name] | <code>string</code> | Plugin name |
 | [options.description] | <code>string</code> | Plugin description |
 | [options.parameters] | <code>string</code> | Plugin parameters |
@@ -2621,12 +2622,3 @@ Creates User List Query
 
 ### userListQuery.toObject() ⇒ <code>Object</code>
 Returns instance as a plain JS object
-
-
-
-## License
-
-[DeviceHive] is developed by [DataArt] Apps and distributed under Open Source
-[Apache 2.0 license](https://en.wikipedia.org/wiki/Apache_License). 
-
-© Copyright 2018 [DataArt] Apps © All Rights Reservedstrong text

example/node/index.js

@@ -1,5 +1,6 @@
 const DeviceHive = require(`../../index`);
 
+
 const httpDeviceHive = new DeviceHive({
     login: `dhadmin`,
     password: `dhadmin_#911`,
@@ -11,7 +12,8 @@ const httpDeviceHive = new DeviceHive({
 const wsDeviceHive = new DeviceHive({
     login: `dhadmin`,
     password: `dhadmin_#911`,
-    mainServiceURL: 'ws://localhost:8080/dh/websocket'
+    mainServiceURL: 'ws://localhost:8080/dh/websocket',
+    autoUpdateSession: true
 });
 
 const DeviceListQuery = DeviceHive.models.query.DeviceListQuery;
@@ -48,7 +50,10 @@ void async function start () {
             console.log(await  wsDeviceHive.network.list(networkListQuery));
             console.log(await  wsDeviceHive.token.refresh(refreshToken));
         }
+
     } catch (error) {
         console.warn(error);
     }
+
+    process.exit(1);
 }();

package.json

@@ -5,7 +5,9 @@
   "main": "index.js",
   "scripts": {
     "build": "node build.js",
-    "test": "node_modules/.bin/mocha test/unit/**/**.spec.js --exit"
+    "test": "npm run unitTest & npm run integrationTest",
+    "unitTest": "node_modules/.bin/mocha test/unit/**/**.spec.js --exit",
+    "integrationTest": "node_modules/.bin/mocha test/integration/**/**.spec.js  --timeout 10000 --exit"
   },
   "repository": {
     "type": "git",
@@ -15,21 +17,23 @@
   "license": "Apache-2.0",
   "dependencies": {
     "isomorphic-fetch": "^2.2.1",
+    "jwt-decode": "^2.2.0",
     "query-string": "^5.1.0",
+    "randomstring": "^1.1.5",
     "string-template": "^1.0.0",
     "universal-websocket-client": "^1.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-beta.40",
     "@babel/preset-env": "^7.0.0-beta.40",
     "babel-core": "^6.26.0",
-    "babel-loader": "^8.0.0-beta.0",
+    "babel-loader": "^8.0.0-beta.2",
     "babelify": "^8.0.0",
     "browserify": "^15.2.0",
     "chai": "^4.1.2",
     "exorcist": "^1.0.1",
     "mocha": "^5.0.1",
     "tinyify": "^2.4.0",
-    "ws": "^4.0.0"
+    "ws": "^4.1.0"
   }
 }

src/ApiStrategy.js

@@ -20,9 +20,9 @@ class ApiStrategy extends EventEmitter {
     static getType(url) {
         let result;
 
-        if (url.startsWith('http') || url.startsWith('https')) {
+        if (url.startsWith(HTTP.TYPE)) {
             result = HTTP;
-        } else if (url.startsWith('ws') || url.startsWith('wss')) {
+        } else if (url.startsWith(WS.TYPE)) {
             result = WS;
         } else {
             throw new UnsupportedTransportError();
@@ -40,6 +40,8 @@ class ApiStrategy extends EventEmitter {
 
         const me = this;
 
+        me.reconnectionHandler = null;
+
         me.urlsMap = new Map();
 
         me.urlsMap.set(API.MAIN_BASE, mainServiceURL);
@@ -48,7 +50,20 @@ class ApiStrategy extends EventEmitter {
 
         me.strategy = new (ApiStrategy.getType(mainServiceURL))({ mainServiceURL, authServiceURL, pluginServiceURL });
 
-        me.strategy.on(`message`, (message) => { me.emit(`message`, message) });
+        me.strategy.on(`message`, (message) => {
+            switch (me.strategy.type) {
+                case HTTP.TYPE:
+                    me.emit(`message`, message);
+                    break;
+                case WS.TYPE:
+                    if (message.subscriptionId && message.action) {
+                        me.emit(`message`, message[message.action.split(`/`)[0]]);
+                    } else {
+                        me.emit(`message`, message);
+                    }
+                    break;
+            }
+        });
     }
 
 
@@ -83,7 +98,25 @@ class ApiStrategy extends EventEmitter {
         }
 
         return me.strategy.send(sendData)
-            .then((response) => API.normalizeResponse(me.strategy.type, key, response));
+            .then((response) => API.normalizeResponse(me.strategy.type, key, response))
+            .catch(error => {
+                if (error === Utils.TOKEN_EXPIRED_MARK && me.reconnectionHandler) {
+                    return me.reconnectionHandler()
+                        .then(() => me.strategy.send(sendData))
+                        .then((response) => API.normalizeResponse(me.strategy.type, key, response));
+                } else {
+                    throw error;
+                }
+            });
+    }
+
+    /**
+     * Disconnects transport
+     */
+    disconnect() {
+        const me = this;
+
+        me.strategy.disconnect();
     }
 }
 

src/DeviceHive.js

@@ -1,3 +1,4 @@
+const Utils = require(`./utils/Utils`);
 const EventEmitter = require('events');
 const APIStrategy = require('./ApiStrategy');
 const InfoAPI = require('./controllers/ServerInfoAPI');
@@ -98,7 +99,7 @@ class DeviceHive extends EventEmitter {
      * @param {string} [options.authServiceURL] - Auth Service URL (required only for http)
      * @param {string} [options.pluginServiceURL] - Alug inServi ceURL (required only for http)
      */
-    constructor({ accessToken, refreshToken, login, password, mainServiceURL, authServiceURL, pluginServiceURL }) {
+    constructor({ mainServiceURL, authServiceURL, pluginServiceURL, accessToken, refreshToken, login, password, autoUpdateSession = true }) {
         super();
 
         const me = this;
@@ -107,6 +108,7 @@ class DeviceHive extends EventEmitter {
         me.refreshToken = refreshToken;
         me.login = login;
         me.password = password;
+        me.autoUpdateSession = autoUpdateSession;
 
         me.strategy = new APIStrategy({ mainServiceURL, authServiceURL, pluginServiceURL });
 
@@ -130,29 +132,65 @@ class DeviceHive extends EventEmitter {
      * Connect to the DeviceHive service
      * @returns {Promise<DeviceHive>}
      */
-    async connect() {
+    async connect({ accessToken, refreshToken, login, password } = {}) {
         const me = this;
 
-        if (me.accessToken || me.refreshToken || (me.login && me.password)) {
+        if (!accessToken && !refreshToken && !(login && password)) {
+            accessToken = accessToken || me.accessToken;
+            refreshToken = refreshToken || me.refreshToken;
+            login = login || me.login;
+            password = password || me.password;
+        }
+
+        if (accessToken || refreshToken || (login && password)) {
             try {
-                if (me.accessToken) {
-                    await me.strategy.authorize(me.accessToken);
-                } else if (me.refreshToken) {
-                    const accessToken = await me.token.refresh(me.refreshToken);
+                if (login && password) {
+                    const { accessToken, refreshToken } = await me.token.login(login, password);
+
                     await me.strategy.authorize(accessToken);
-                } else if (me.login && me.password) {
-                    const { accessToken } = await me.token.login(me.login, me.password);
+
+                    me.accessToken = accessToken;
+                    me.refreshToken = refreshToken;
+                } else if (refreshToken) {
+                    const { accessToken } = await me.token.refresh(refreshToken);
+
                     await me.strategy.authorize(accessToken);
+
+                    me.accessToken = accessToken;
+                    me.refreshToken = refreshToken;
+                } else if (accessToken) {
+                    await me.strategy.authorize(accessToken);
+
+                    me.accessToken = accessToken;
+                }
+
+                if (me.autoUpdateSession === true) {
+                    const userTokens = await me.token.createUserToken(
+                        Utils.createUserTokenFromJWT(me.accessToken));
+
+                    me.accessToken = userTokens.accessToken;
+                    me.refreshToken = userTokens.refreshToken;
+                    me.strategy.reconnectionHandler = () => me.connect({ refreshToken: me.refreshToken });
                 }
             } catch (error) {
-                throw new InvalidCredentialsError();
+                throw new InvalidCredentialsError(error);
             }
         } else {
             throw new NoAuthCredentialsError();
         }
 
         return me;
     }
+
+    /**
+     * Disconnects from DeviceHive server
+     * @returns {*|void}
+     */
+    disconnect() {
+        const me = this;
+
+        return me.strategy.disconnect();
+    }
 }