sinricpro 2.6.1 → 2.8.1

package/CHANGELOG.md

@@ -4,3 +4,8 @@
 
 * **Custom device types support**
 * **SR_DEBUG to support debug logs**
+
+## [2.7.1]
+
+### Features
+* **Push notification feature added**

package/lib/cbhandler.js

@@ -19,6 +19,8 @@ const { Bands, BandReset } = require('./contorllers/speaker_controller');
 const { AdjustBands } = require('./contorllers/speaker_controller');
 const { ToggleState } = require('./contorllers/toggle_state_controller');
 const { Mode } = require('./contorllers/mode_controller');
+const { WebRTC } = require('./contorllers/webrtc_controller');
+const { UndefinedCallbackError, InvalidResponseError } = require('./errors/errors');
 
 const jsonResponse = (client, defaultPayload, payloadValue, instanceId) => {
   const header = {
@@ -38,158 +40,122 @@ const jsonResponse = (client, defaultPayload, payloadValue, instanceId) => {
     value: payloadValue,
   };
 
-  if(instanceId) payload.instanceId = instanceId;
- 
+  if (instanceId) payload.instanceId = instanceId;
+
   const signature = {
     HMAC: getSignature(client, JSON.stringify(payload)),
   };
   return { header, payload, signature };
 };
 
+const handleError = (e) => {
+  if (e instanceof UndefinedCallbackError || e instanceof InvalidResponseError) {
+    console.error(e);
+  } else if (process.env.SR_DEBUG) console.log(e.message);
+};
+
 const handlePayload = (client, payload, signature, callbacks) => verifySignature(client, payload, signature)
   .then((action) => {
     /* eslint no-else-return: ["error", {allowElseIf: true}] */
     if (action === 'setPowerState') {
       return powerState(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'setPowerLevel') {
       return powerLevel(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'adjustPowerLevel') {
       return powerLevelAdjust(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'setBrightness') {
       return Brightness(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'adjustBrightness') {
       return BrightnessAdjust(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'setColor') {
       return Color(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'setColorTemperature') {
       return ColorTemperature(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'setThermostatMode') {
       return ThermoStatMode(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'targetTemperature') {
       return ThermoStatTemperature(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'setRangeValue') {
       return RangeValue(payload, callbacks)
         .then(([value, instanceId]) => jsonResponse(client, payload, value, instanceId))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'adjustRangeValue') {
       return RangeValueAdjust(payload, callbacks)
         .then(([value, instanceId]) => jsonResponse(client, payload, value, instanceId))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'setVolume') {
       return Volume(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'adjustVolume') {
       return VolumeAdjust(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'selectInput') {
       return Input(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'mediaControl') {
       return Media(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'changeChannel') {
       return ChangeChannel(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'skipChannels') {
       return SkipChannel(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'setBands') {
       return Bands(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'adjustBands') {
       return AdjustBands(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'resetBands') {
       return BandReset(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'setMode') {
       return Mode(payload, callbacks)
         .then(([value, instanceId]) => jsonResponse(client, payload, value, instanceId))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'setLockState') {
       return Lock(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'setMute') {
       return Mute(payload, callbacks)
         .then((value) => jsonResponse(client, payload, value))
-        .catch((err) => {
-          if (process.env.SR_DEBUG) console.log(err.message);
-        });
+        .catch(handleError);
     } else if (action === 'setToggleState') {
       return ToggleState(payload, callbacks)
         .then(([value, instanceId]) => jsonResponse(client, payload, value, instanceId))
+        .catch(handleError);
+    } else if (action === 'webrtcOffer') {
+      return WebRTC(payload, callbacks)
+        .then(([value, answer]) => jsonResponse(client, payload, { answer: answer } ))
         .catch((err) => {
           if (process.env.SR_DEBUG) console.log(err.message);
         });

package/lib/contorllers/brightness_controller.js

@@ -1,4 +1,3 @@
-
 /*
  *  Copyright (c) 2019 Sinric. All rights reserved.
  *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
@@ -7,25 +6,35 @@
  */
 
 const sinricProData = require('../storage');
+const { UndefinedCallbackError, InvalidResponseError } = require('../errors/errors');
 
-const Brightness = (payload, callback) => {
+const Brightness = async (payload, callback) => {
   sinricProData.brightness = payload.value.brightness;
-  const resp = callback.setBrightness(payload.deviceId, sinricProData.brightness);
-  return new Promise((resolve, reject) => {
-    if (payload.value.brightness && resp) resolve(payload.value);
-    else reject(new Error('brightness is undefined'));
-  });
+
+  if (callback.setBrightness) {
+    const resp = await callback.setBrightness(payload.deviceId, sinricProData.brightness);
+    if (payload.value.brightness && resp) return payload.value;
+    throw new InvalidResponseError('brightness is undefined');
+  } else {
+    throw new UndefinedCallbackError('setBrightness callback is undefined.');
+  }
 };
 
-const BrightnessAdjust = (payload, callback) => {
+const BrightnessAdjust = async (payload, callback) => {
   sinricProData.brightness += payload.value.brightnessDelta;
-  if (sinricProData.brightness < 0) sinricProData.brightness = 0;
-  else if (sinricProData.brightness > 100) sinricProData.brightness = 100;
-  const resp = callback.adjustBrightness(payload.deviceId, sinricProData.brightness);
-  return new Promise((resolve, reject) => {
-    if (payload.value.brightness && resp) resolve({ brightness: sinricProData.brightness });
-    else reject(new Error('brightness is undefined'));
-  });
+  if (sinricProData.brightness < 0) {
+    sinricProData.brightness = 0;
+  } else if (sinricProData.brightness > 100) {
+    sinricProData.brightness = 100;
+  }
+
+  if (callback.adjustBrightness) {
+    const resp = await callback.adjustBrightness(payload.deviceId, sinricProData.brightness);
+    if (payload.value.brightness && resp) return { brightness: sinricProData.brightness };
+    throw new InvalidResponseError('brightness is undefined');
+  } else {
+    throw new UndefinedCallbackError('setBrightness callback is undefined');
+  }
 };
 
 module.exports = { Brightness, BrightnessAdjust };

package/lib/contorllers/color_controller.js

@@ -1,4 +1,3 @@
-
 /*
  *  Copyright (c) 2019 Sinric. All rights reserved.
  *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
@@ -7,14 +6,18 @@
  */
 
 const sinricProData = require('../storage');
+const { UndefinedCallbackError, InvalidResponseError } = require('../errors/errors');
 
-const Color = (payload, callbacks) => {
+const Color = async (payload, callbacks) => {
   sinricProData.color = payload.value.color;
-  const resp = callbacks.setColor(payload.deviceId, payload.value.color);
-  return new Promise((resolve, reject) => {
-    if (payload.value.color && resp) resolve(payload.value);
-    else reject(new Error('Colors undefined'));
-  });
+
+  if (callbacks.setColor) {
+    const resp = await callbacks.setColor(payload.deviceId, payload.value.color);
+    if (payload.value.color && resp) return payload.value;
+    throw new InvalidResponseError('Colors undefined');
+  } else {
+    throw new UndefinedCallbackError('setColor callback is undefined');
+  }
 };
 
 module.exports = { Color };

package/lib/contorllers/color_temperature.js

@@ -1,4 +1,3 @@
-
 /*
  *  Copyright (c) 2019 Sinric. All rights reserved.
  *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
@@ -7,15 +6,18 @@
  */
 
 const sinricProData = require('../storage');
+const { UndefinedCallbackError, InvalidResponseError } = require('../errors/errors');
 
-const ColorTemperature = (payload, callbacks) => {
+const ColorTemperature = async (payload, callbacks) => {
   sinricProData.colorTemperature = payload.value.colorTemperature;
-  const resp = callbacks.setColorTemperature(payload.deviceId, payload.value.colorTemperature);
 
-  return new Promise((resolve, reject) => {
-    if (payload.value.colorTemperature && resp) resolve(payload.value);
-    else reject(new Error('color temperature is undefined'));
-  });
+  if (callbacks.setColorTemperature) {
+    const resp = await callbacks.setColorTemperature(payload.deviceId, payload.value.colorTemperature);
+    if (payload.value.colorTemperature && resp) return payload.value;
+    throw new InvalidResponseError('color temperature is undefined');
+  } else {
+    throw new UndefinedCallbackError('setColorTemperature callback is undefined!');
+  }
 };
 
 module.exports = { ColorTemperature };

package/lib/contorllers/mode_controller.js

@@ -5,17 +5,18 @@
  *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
  */
 
-const sinricData = require('../storage');
- 
-const Mode = (payload, callbacks) => {
-  const resp = callbacks.setMode(payload.deviceId, payload.value.mode, payload.instanceId);
-  
-  return new Promise((resolve, reject) => {
-    if (resp) resolve([payload.value, payload.instanceId]);
-    else reject(new Error('Mode undefined'));
-  });
+const { UndefinedCallbackError, InvalidResponseError } = require('../errors/errors');
+
+const Mode = async (payload, callbacks) => {
+  if (callbacks.setMode) {
+    const resp = await callbacks.setMode(payload.deviceId, payload.value.mode, payload.instanceId);
+    if (resp) return [payload.value, payload.instanceId];
+    throw new InvalidResponseError('Mode undefined');
+  } else {
+    throw new UndefinedCallbackError('setMode callback is undefined!');
+  }
 };
 
 module.exports = {
-  Mode
+  Mode,
 };

package/lib/contorllers/power_controller.js

@@ -1,4 +1,3 @@
-
 /*
  *  Copyright (c) 2019 Sinric. All rights reserved.
  *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
@@ -7,39 +6,48 @@
  */
 
 const sinricProData = require('../storage');
+const { UndefinedCallbackError, InvalidResponseError } = require('../errors/errors');
 
-const powerState = (payload, callbacks) => {
-  const resp = callbacks.setPowerState(payload.deviceId, payload.value.state);
-  return new Promise((resolve, reject) => {
+const powerState = async (payload, callbacks) => {
+  if (callbacks.setPowerState) {
+    const resp = await callbacks.setPowerState(payload.deviceId, payload.value.state);
     if (payload.value.state && resp) {
-      resolve(payload.value);
-    } else {
-      reject(new Error('State is undefined'));
+      return payload.value;
     }
-  });
+    throw new InvalidResponseError('State is undefined');
+  } else {
+    throw new UndefinedCallbackError('setPowerState callback is undefined.');
+  }
 };
 
-const powerLevel = (payload, callbacks) => {
+const powerLevel = async (payload, callbacks) => {
   sinricProData.powerLevel = payload.value.powerLevel;
-  const resp = callbacks.setPowerLevel(payload.deviceId, payload.value.powerLevel);
-  return new Promise((resolve, reject) => {
+
+  if (callbacks.setPowerLevel) {
+    const resp = await callbacks.setPowerLevel(payload.deviceId, payload.value.powerLevel);
     if (payload.value.powerLevel && resp) {
-      resolve(payload.value);
-    } else {
-      reject(new Error('powerLevel is undefined'));
+      return payload.value;
     }
-  });
+    throw new InvalidResponseError('powerLevel is undefined');
+  } else {
+    throw new UndefinedCallbackError('setPowerLevel callback is undefined.');
+  }
 };
 
-const powerLevelAdjust = (payload, callbacks) => {
+const powerLevelAdjust = async (payload, callbacks) => {
   sinricProData.powerLevel += payload.value.powerLevelDelta;
+
   if (sinricProData.powerLevel < 0) sinricProData.powerLevel = 0;
   else if (sinricProData.powerLevel > 100) sinricProData.powerLevel = 100;
-  const resp = callbacks.adjustPowerLevel(payload.deviceId, sinricProData.powerLevel);
-  return new Promise((resolve, reject) => {
-    if (payload.value.powerLevelDelta && resp) resolve({ powerLevel: sinricProData.powerLevel });
-    else reject(new Error('PowerLevelDelta is 0 or undefined'));
-  });
+
+  if (callbacks.adjustPowerLevel) {
+    const resp = await callbacks.adjustPowerLevel(payload.deviceId, sinricProData.powerLevel);
+
+    if (payload.value.powerLevelDelta && resp) return { powerLevel: sinricProData.powerLevel };
+    throw new InvalidResponseError('PowerLevelDelta is 0 or undefined');
+  } else {
+    throw new UndefinedCallbackError('adjustPowerLevel callback is undefined.');
+  }
 };
 
 module.exports = { powerState, powerLevel, powerLevelAdjust };

package/lib/contorllers/range_value_controller.js

@@ -6,31 +6,33 @@
  */
 
 const sinricProData = require('../storage');
+const { UndefinedCallbackError, InvalidResponseError } = require('../errors/errors');
 
-const RangeValue = (payload, callbacks) => {
+const RangeValue = async (payload, callbacks) => {
   sinricProData.rangeValue = payload.value.rangeValue;
-  
-  const resp = callbacks.setRangeValue(payload.deviceId, sinricProData.rangeValue, payload.instanceId);
 
-  return new Promise((resolve, reject) => {
-    if (payload.value.rangeValue !== undefined && resp) resolve([payload.value, payload.instanceId]);
-    else reject(new Error('RangeValue is undefined'));
-  });
+  if (callbacks.setRangeValue) {
+    const resp = await callbacks.setRangeValue(payload.deviceId, sinricProData.rangeValue, payload.instanceId);
+    if (payload.value.rangeValue !== undefined && resp) return [payload.value, payload.instanceId];
+    throw new InvalidResponseError('RangeValue is undefined');
+  } else {
+    throw new UndefinedCallbackError('setRangeValue callback is undefined.');
+  }
 };
 
-const RangeValueAdjust = (payload, callbacks) => {
-  sinricProData.rangeValue += payload.value.rangeValueDelta; 
+const RangeValueAdjust = async (payload, callbacks) => {
+  sinricProData.rangeValue += payload.value.rangeValueDelta;
 
   if (sinricProData.rangeValue < 0) sinricProData.rangeValue = 0;
   else if (sinricProData.rangeValue > 100) sinricProData.rangeValue = 100;
 
-  const resp = callbacks.adjustRangeValue(payload.deviceId, sinricProData.rangeValue, payload.instanceId);
-
-  return new Promise((resolve, reject) => {
-    if (payload.value.rangeValueDelta && resp) resolve([{ rangeValue: sinricProData.rangeValue }, payload.instanceId]);
-    else reject(new Error('RangeValue undefined'));
-  });
+  if (callbacks.adjustRangeValue) {
+    const resp = await callbacks.adjustRangeValue(payload.deviceId, sinricProData.rangeValue, payload.instanceId);
+    if (payload.value.rangeValueDelta && resp) return [{ rangeValue: sinricProData.rangeValue }, payload.instanceId];
+    throw new InvalidResponseError('RangeValue is undefined');
+  } else {
+    throw new UndefinedCallbackError('adjustRangeValue callback is undefined.');
+  }
 };
 
-
 module.exports = { RangeValue, RangeValueAdjust };

package/lib/contorllers/sensors_controller.js

@@ -1,4 +1,3 @@
-
 /*
  *  Copyright (c) 2019 Sinric. All rights reserved.
  *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
@@ -7,30 +6,39 @@
  */
 
 const sinricProData = require('../storage');
+const { UndefinedCallbackError, InvalidResponseError } = require('../errors/errors');
 
-const ThermoStatMode = (payload, callbacks) => {
+const ThermoStatMode = async (payload, callbacks) => {
   sinricProData.thermostat.mode = payload.value.thermostatMode;
-  const resp = callbacks.setThermostatMode(payload.deviceId, sinricProData.thermostat.mode);
-  return new Promise((resolve, reject) => {
-    if (payload.value.thermostatMode && resp) resolve(payload.value);
-    else reject(new Error('Thermostat mode undefined'));
-  });
+
+  if (callbacks.setThermostatMode) {
+    const resp = await callbacks.setThermostatMode(payload.deviceId, sinricProData.thermostat.mode);
+    if (payload.value.thermostatMode && resp) return payload.value;
+    throw new InvalidResponseError('Thermostat mode undefined');
+  } else {
+    throw new UndefinedCallbackError('setThermostatMode callback is undefined.');
+  }
 };
-const ThermoStatTemperature = (payload, callbacks) => {
+const ThermoStatTemperature = async (payload, callbacks) => {
   sinricProData.thermostat.temperature = payload.value.temperature;
-  const resp = callbacks.targetTemperature(payload.deviceId, sinricProData.thermostat.temperature);
-  return new Promise((resolve, reject) => {
-    if (payload.value.temperature && resp) resolve(payload.value);
-    else reject(new Error('Thermostat temperature undefined'));
-  });
+
+  if (callbacks.targetTemperature) {
+    const resp = await callbacks.targetTemperature(payload.deviceId, sinricProData.thermostat.temperature);
+    if (payload.value.temperature && resp) return payload.value;
+    throw new InvalidResponseError('Thermostat temperature undefined');
+  } else {
+    throw new UndefinedCallbackError('targetTemperature callback is undefined.');
+  }
 };
 
-const Lock = (payload, callbacks) => {
-  const resp = callbacks.setLockState(payload.deviceId, payload.value.state);
-  return new Promise((resolve, reject) => {
-    if (resp) resolve({ state: `${payload.value.state.toUpperCase()}ED` });
-    else reject(new Error('Set lock state error'));
-  });
+const Lock = async (payload, callbacks) => {
+  if (callbacks.setLockState) {
+    const resp = await callbacks.setLockState(payload.deviceId, payload.value.state);
+    if (resp) return { state: `${payload.value.state.toUpperCase()}ED` };
+    throw new InvalidResponseError('Lock state is undefined');
+  } else {
+    throw new UndefinedCallbackError('setLockState callback is undefined.');
+  }
 };
 
 module.exports = { ThermoStatMode, ThermoStatTemperature, Lock };

package/lib/contorllers/speaker_controller.js

@@ -1,4 +1,3 @@
-
 /*
  *  Copyright (c) 2019 Sinric. All rights reserved.
  *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
@@ -7,35 +6,44 @@
  */
 
 const sinricData = require('../storage');
+const { UndefinedCallbackError, InvalidResponseError } = require('../errors/errors');
 
-const Bands = (payload, callbacks) => {
+const Bands = async (payload, callbacks) => {
   sinricData.bands[0].level = payload.value.bands[0].level;
   sinricData.bands[0].name = payload.value.bands[0].name;
-  const resp = callbacks.setBands(payload.deviceId, payload.value.bands);
-  return new Promise((resolve, reject) => {
-    if (resp === true) resolve(payload.value);
-    else reject(new Error('Callback failed'));
-  });
+
+  if (callbacks.setBands) {
+    const resp = await callbacks.setBands(payload.deviceId, payload.value.bands);
+    if (resp === true) return payload.value;
+    throw new InvalidResponseError('Callback failed');
+  } else {
+    throw new UndefinedCallbackError('setBands callback is undefined.');
+  }
 };
 
-const BandReset = (payload, callbacks) => {
-  const resp = callbacks.resetBands(payload.deviceId, payload.value);
-  return new Promise((resolve, reject) => {
-    if (resp) resolve(payload.value);
-    else reject(new Error('Rest Bands Failed'));
-  });
+const BandReset = async (payload, callbacks) => {
+  if (callbacks.resetBands) {
+    const resp = await callbacks.resetBands(payload.deviceId, payload.value);
+    if (resp === true) return payload.value;
+    throw new InvalidResponseError('Callback failed');
+  } else {
+    throw new UndefinedCallbackError('resetBands callback is undefined.');
+  }
 };
 
-const AdjustBands = (payload, callbacks) => {
+const AdjustBands = async (payload, callbacks) => {
   if (payload.value.bands[0].levelDelta) {
     if (sinricData.bands[0].levelDirection === 'UP') sinricData.bands[0].level += payload.value.bands[0].levelDelta;
     else if (sinricData.bands[0].levelDirection === 'DOWN') sinricData.bands[0].level -= payload.value.bands[0].levelDelta;
   }
-  const resp = callbacks.adjustBands(payload.deviceId, sinricData.bands);
-  return new Promise((resolve, reject) => {
-    if (resp) resolve(payload.value, { bands: [{ level: sinricData.bands[0].level, name: sinricData.bands[0].name }] });
-    else reject(new Error('Rest Bands Failed'));
-  });
+
+  if (callbacks.adjustBands) {
+    const resp = await callbacks.adjustBands(payload.deviceId, payload.value);
+    if (resp === true) return [payload.value, { bands: [{ level: sinricData.bands[0].level, name: sinricData.bands[0].name }] }];
+    throw new InvalidResponseError('Callback failed');
+  } else {
+    throw new UndefinedCallbackError('adjustBands callback is undefined.');
+  }
 };
 
 module.exports = {

package/lib/contorllers/toggle_state_controller.js

@@ -4,16 +4,18 @@
  *
  *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
  */
+const { UndefinedCallbackError, InvalidResponseError } = require('../errors/errors');
 
-const ToggleState = (payload, callbacks) => {
-    const resp = callbacks.setToggleState(payload.deviceId, payload.value.state, payload.instanceId);
-
-    return new Promise((resolve, reject) => {
-        if (resp) resolve([payload.value, payload.instanceId]);
-        else reject(new Error('Toggle State Error'));
-    });
+const ToggleState = async (payload, callbacks) => {
+  if (callbacks.setToggleState) {
+    const resp = await callbacks.setToggleState(payload.deviceId, payload.value.state, payload.instanceId);
+    if (resp === true) return [payload.value, payload.instanceId];
+    throw new InvalidResponseError('Callback failed');
+  } else {
+    throw new UndefinedCallbackError('setToggleState callback is undefined.');
+  }
 };
 
 module.exports = {
-    ToggleState
-};
+  ToggleState,
+};

package/lib/contorllers/tv_controller.js

@@ -1,4 +1,3 @@
-
 /*
  *  Copyright (c) 2019 Sinric. All rights reserved.
  *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
@@ -7,68 +6,86 @@
  */
 
 const sinricProData = require('../storage');
+const { UndefinedCallbackError, InvalidResponseError } = require('../errors/errors');
 
-const Volume = (payload, callbacks) => {
+const Volume = async (payload, callbacks) => {
   sinricProData.volume = payload.value.volume;
-  const resp = callbacks.setVolume(payload.deviceId, sinricProData.volume);
-  return new Promise((resolve, reject) => {
-    if (payload.value.volume && resp) resolve(payload.value);
-    else reject(new Error('Volume undefined'));
-  });
+
+  if (callbacks.setVolume) {
+    const resp = callbacks.setVolume(payload.deviceId, sinricProData.volume);
+    if (payload.value.volume && resp) return payload.value;
+    throw new InvalidResponseError('Volume undefined');
+  } else {
+    throw new UndefinedCallbackError('setVolume callback is undefined.');
+  }
 };
 
-const VolumeAdjust = (payload, callbacks) => {
+const VolumeAdjust = async (payload, callbacks) => {
   sinricProData.volume += payload.value.volume;
   if (sinricProData.volume > 100) sinricProData.volume = 100;
   else if (sinricProData.volume < 0) sinricProData.volume = 0;
-  const resp = callbacks.adjustVolume(payload.deviceId, sinricProData.volume);
-  return new Promise((resolve, reject) => {
-    if (payload.value.volume && resp) resolve({ volume: sinricProData.volume });
-    else reject(new Error('Volume undefined'));
-  });
-};
 
+  if (callbacks.adjustVolume) {
+    const resp = await callbacks.setVolume(payload.deviceId, sinricProData.volume);
+    if (payload.value.volume && resp) return { volume: sinricProData.volume };
+    throw new InvalidResponseError('Volume undefined');
+  } else {
+    throw new UndefinedCallbackError('adjustVolume callback is undefined.');
+  }
+};
 
-const Mute = (payload, callbacks) => {
-  const resp = callbacks.setMute(payload.deviceId, payload.value.mute);
-  return new Promise((resolve, reject) => {
-    if ((payload.value.mute === true || payload.value.mute === false) && resp) resolve(payload.value);
-    else reject(new Error('Mute undefined'));
-  });
+const Mute = async (payload, callbacks) => {
+  if (callbacks.setMute) {
+    const resp = await callbacks.setMute(payload.deviceId, payload.value.mute);
+    if ((payload.value.mute === true || payload.value.mute === false) && resp) return payload.value;
+    throw new InvalidResponseError('Mute undefined');
+  } else {
+    throw new UndefinedCallbackError('setMute callback is undefined.');
+  }
 };
 
-const Input = (payload, callbacks) => {
+const Input = async (payload, callbacks) => {
   sinricProData.input = payload.value.input;
-  const resp = callbacks.selectInput(payload.deviceId, payload.value.input);
-  return new Promise((resolve, reject) => {
-    if (payload.value.input && resp) resolve(payload.value);
-    else reject(new Error('Input undefined'));
-  });
+
+  if (callbacks.selectInput) {
+    const resp = await callbacks.selectInput(payload.deviceId, payload.value.input);
+    if ((payload.value.mute === true || payload.value.mute === false) && resp) return payload.value;
+    throw new InvalidResponseError('Input undefined');
+  } else {
+    throw new UndefinedCallbackError('selectInput callback is undefined.');
+  }
 };
 
-const Media = (payload, callbacks) => {
-  const resp = callbacks.mediaControl(payload.deviceId, payload.value.control);
-  return new Promise((resolve, reject) => {
-    if (payload.value.control && resp) resolve(payload.value);
-    else reject(new Error('Control undefined'));
-  });
+const Media = async (payload, callbacks) => {
+  if (callbacks.selectInput) {
+    const resp = await callbacks.mediaControl(payload.deviceId, payload.value.control);
+    if (payload.value.control && resp) return payload.value;
+    throw new InvalidResponseError('Control undefined');
+  } else {
+    throw new UndefinedCallbackError('mediaControl callback is undefined.');
+  }
 };
 
-const ChangeChannel = (payload, callbacks) => {
+const ChangeChannel = async (payload, callbacks) => {
   const channel = payload.value.channel.name || payload.value.channel.number;
-  const resp = callbacks.changeChannel(payload.deviceId, channel);
-  return new Promise((resolve, reject) => {
-    if (channel && resp) resolve(payload.value);
-    else reject(new Error('Channel name undefined'));
-  });
+
+  if (callbacks.changeChannel) {
+    const resp = callbacks.changeChannel(payload.deviceId, channel);
+    if (channel && resp) return payload.value;
+    throw new InvalidResponseError('Channel name undefined');
+  } else {
+    throw new UndefinedCallbackError('mediaControl callback is undefined.');
+  }
 };
 
 const SkipChannel = (payload, callbacks) => {
-  const resp = callbacks.skipChannels(payload.deviceId, payload.value.channelCount);
-  return new Promise((resolve, reject) => {
-    if (payload.value.channelCount && resp) resolve(payload.value);
-    else reject(new Error('Channel count undefined'));
-  });
+  if (callbacks.changeChannel) {
+    const resp = callbacks.skipChannels(payload.deviceId, payload.value.channelCount);
+    if (payload.value.channelCount && resp) return payload.value;
+    throw new InvalidResponseError('Channel count undefined');
+  } else {
+    throw new UndefinedCallbackError('skipChannels callback is undefined.');
+  }
 };
 
 module.exports = {

package/lib/contorllers/webrtc_controller.js

@@ -0,0 +1,21 @@
+/*
+ *  Copyright (c) 2019 Sinric. All rights reserved.
+ *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
+ *
+ *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
+ */
+const { UndefinedCallbackError, InvalidResponseError } = require('../errors/errors');
+
+const WebRTC = async (payload, callbacks) => {
+  if (callbacks.webRtcOffer) {
+    const data = await callbacks.webRtcOffer(payload.deviceId, payload.value.format, payload.value.value);
+    if (data) return [payload.value, data.answer];
+    throw new InvalidResponseError('WebRTC error');
+  } else {
+    throw new UndefinedCallbackError('webRtcOffer callback is undefined.');
+  }
+};
+
+module.exports = {
+  WebRTC,
+};

package/lib/errors/errors.js

@@ -0,0 +1,8 @@
+/* eslint-disable max-classes-per-file */
+// eslint-disable-next-line linebreak-style
+class UndefinedCallbackError extends Error { }
+
+class InvalidResponseError extends Error {}
+
+module.exports.UndefinedCallbackError = UndefinedCallbackError;
+module.exports.InvalidResponseError = InvalidResponseError;

package/lib/events/event_handler.js

@@ -55,9 +55,10 @@ const eventNames = {
   lock: 'setLockState',
   mute: 'setMute',
   currentTemperature: 'currentTemperature',
+  pushNotification: 'pushNotification',
 };
 
-const actionArr = ['setPowerState', 'setBrightness', 'setPowerLevel', 'setColor', 'setColorTemperature', 'DoorbellPress', 'currentTemperature'];
+const actionArr = ['setPowerState', 'setBrightness', 'setPowerLevel', 'setColor', 'setColorTemperature', 'DoorbellPress', 'currentTemperature', 'pushNotification'];
 
 const getJson = (client, eventName, deviceId, value) => {
   const header = {
@@ -93,7 +94,7 @@ const raiseEvent = async (client, eventName, deviceId, value) => {
       console.log('Too many events!');
     }
   } else {
-    console.log('Invalid Event');
+    console.log(`Invalid Event: ${eventName}`);
   }
 };
 

package/lib/sinrcpro.js

@@ -15,7 +15,7 @@ const sdkVersion = require('./../package.json').version;
 
 class SinricPro extends Websocket {
   constructor(appkey, deviceids, secretKey, restoreStates) {
-    super("ws://ws.sinric.pro", {
+    super("wss://ws.sinric.pro", {
       headers: {
         appkey,
         deviceids: deviceids.join(';'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sinricpro",
-  "version": "2.6.1",
+  "version": "2.8.1",
   "description": "Sinric Pro Nodejs SDK",
   "main": "index.js",
   "repository": {
@@ -15,6 +15,7 @@
   "homepage": "https://github.com/sinricpro/nodejs-sdk#readme",
   "dependencies": {
     "dgram": "^1.0.1",
+    "node-fetch": "^2.6.11",
     "process": "^0.11.10",
     "rate-limiter-flexible": "^2.3.6",
     "rxjs": "^6.6.3",