Merge pull request #9 from devicehive/bugfix/#7

API type refs updated. Fix #7

Author: MykytaLiashenko

lib/Device.js

@@ -1,4 +1,4 @@
-const { getAPI, type } = require(`../src/api`);
+const { getAPI, getType } = require(`../src/api`);
 const DeviceCommand = require(`./DeviceCommand`);
 const DeviceNotification = require(`./DeviceNotification`);
 let api;
@@ -231,7 +231,7 @@ class Device {
    * @memberof Device
    */
   subscribeCommands(subscriber, commandFilter = {}){
-    if (type === `ht`){
+    if (getType() === `ht`){
       const filterKey = JSON.stringify(commandFilter);
       this._commandsSubscribers[filterKey] = subscriber;
       this._pollCommands(commandFilter);
@@ -250,7 +250,7 @@ class Device {
    * @memberof Device
    */
   unsubscribeCommands(commandFilter={}){
-    if (type === `ht`){
+    if (getType() === `ht`){
       const filterKey = JSON.stringify(commandFilter);
       delete this._commandsSubscribers[filterKey];
       return Promise.resolve();
@@ -269,7 +269,7 @@ class Device {
    * @memberof Device
    */
   subscribeNotifications(subscriber, notificationFilter = {}){
-    if (type === `ht`){
+    if (getType() === `ht`){
       const filterKey = JSON.stringify(notificationFilter);
       this._notificationsSubscribers[filterKey] = subscriber;
       this._pollNotifications(notificationFilter);
@@ -288,7 +288,7 @@ class Device {
    * @memberof Device
    */
   unsubscribeNotifications(notificationFilter = {}){
-    if (type === `ht`){
+    if (getType() === `ht`){
       const filterKey = JSON.stringify(notificationFilter);
       delete this._notificationsSubscribers[filterKey];
       return Promise.resolve();

lib/DeviceCommand.js

@@ -1,4 +1,4 @@
-const { getAPI, type } = require(`../src/api`);
+const { getAPI } = require(`../src/api`);
 let api;
 
 class DeviceCommand {

lib/DeviceHive.js

@@ -1,4 +1,4 @@
-const { init, type } = require(`../src/api`);
+const { init, getType } = require(`../src/api`);
 const Device = require(`./Device`);
 const DeviceCommand = require(`./DeviceCommand`);
 const DeviceNotification = require(`./DeviceNotification`);
@@ -334,7 +334,7 @@ class DeviceHive{
    */
   subscribeCommands(deviceIds, subscriber, commandFilter){
     commandFilter.deviceIds = deviceIds;
-    if (type === `ht`){
+    if (getType() === `ht`){
       const filterKey = JSON.stringify(commandFilter);
       this._commandsSubscribers[filterKey] = subscriber;
       this._pollCommands(commandFilter);
@@ -354,7 +354,7 @@ class DeviceHive{
    */
   unsubscribeCommands(deviceIds, commandFilter){
     commandFilter.deviceIds = deviceIds;
-    if (type === `ht`){
+    if (getType() === `ht`){
       const filterKey = JSON.stringify(commandFilter);
       delete this._commandsSubscribers[filterKey];
       return Promise.resolve();
@@ -378,7 +378,7 @@ class DeviceHive{
    */
   subscribeNotifications(deviceIds, subscriber, notificationFilter){
     notificationFilter.deviceIds = deviceIds;
-    if (type === `ht`){
+    if (getType() === `ht`){
       const filterKey = JSON.stringify(notificationFilter);
       this._notificationsSubscribers[filterKey] = subscriber;
       this._pollNotifications(notificationFilter);
@@ -398,7 +398,7 @@ class DeviceHive{
    */
   unsubscribeNotifications(deviceIds, notificationFilter){
     notificationFilter.deviceIds = deviceIds;
-    if (type === `ht`){
+    if (getType() === `ht`){
       const filterKey = JSON.stringify(notificationFilter);
       delete this._notificationsSubscribers[filterKey];
       return Promise.resolve();

src/api.js

@@ -17,6 +17,14 @@ function init(serverURL){
   }
 }
 
+/**
+ * Returns api type
+ * @returns {*}
+ */
+function getType(){
+  return type;
+}
+
 /**
  * Returns current API
  * 
@@ -33,5 +41,6 @@ function getAPI(){
 module.exports = {
   init,
   getAPI,
-  type
+  type,
+  getType
 }