sinricpro 2.8.1 → 2.10.1

package/.prettierrc

@@ -0,0 +1,5 @@
+{
+  "tabWidth": 2,
+  "useTabs": false,
+  "printWidth": 120
+}

package/lib/cbhandler.js

@@ -10,7 +10,7 @@ const { powerState, powerLevel, powerLevelAdjust } = require('./contorllers/powe
 const { Brightness, BrightnessAdjust } = require('./contorllers/brightness_controller');
 const { Color } = require('./contorllers/color_controller');
 const { ColorTemperature } = require('./contorllers/color_temperature');
-const { ThermoStatMode, ThermoStatTemperature, Lock } = require('./contorllers/sensors_controller');
+const { ThermoStatMode, ThermoStatTemperature, Lock, AdjustTargetTemperature } = require('./contorllers/sensors_controller');
 const { RangeValue, RangeValueAdjust } = require('./contorllers/range_value_controller');
 const { Volume, VolumeAdjust, Mute } = require('./contorllers/tv_controller');
 const { ChangeChannel, SkipChannel, Media } = require('./contorllers/tv_controller');
@@ -19,7 +19,7 @@ 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 { CameraStreamController } = require('./contorllers/camera_stream_controller');
 const { UndefinedCallbackError, InvalidResponseError } = require('./errors/errors');
 
 const jsonResponse = (client, defaultPayload, payloadValue, instanceId) => {
@@ -45,6 +45,7 @@ const jsonResponse = (client, defaultPayload, payloadValue, instanceId) => {
   const signature = {
     HMAC: getSignature(client, JSON.stringify(payload)),
   };
+
   return { header, payload, signature };
 };
 
@@ -153,16 +154,29 @@ const handlePayload = (client, payload, signature, callbacks) => verifySignature
       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);
-        });
+    } else if (action === 'getWebRTCAnswer') {
+      return CameraStreamController(payload, callbacks)
+        .then((answer) => jsonResponse(client, payload, { answer }))
+        .catch(handleError);
+    } else if (action === 'getCameraStreamUrl') {
+      return CameraStreamController(payload, callbacks)
+        .then((url) => jsonResponse(client, payload, { url }))
+        .catch(handleError);
+    } else if (action === 'getWebRTCOffer') {
+      return CameraStreamController(payload, callbacks)
+        .then((offer) => jsonResponse(client, payload, { offer }))
+        .catch(handleError);
+    } else if (action === 'adjustTargetTemperature') {
+      return AdjustTargetTemperature(payload, callbacks)
+        .then((resp) => {
+          const  { temperature } = resp;
+          return jsonResponse(client, payload, temperature);
+        })
+        .catch(handleError);
     }
     return {};
   })
   .catch((err) => {
-    console.error(err.message);
+    console.error(err);
   });
 module.exports = handlePayload;

package/lib/contorllers/camera_stream_controller.js

@@ -0,0 +1,39 @@
+/*
+ *  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 CameraStreamController = async (payload, callbacks) => {
+  if (payload.action === "getWebRTCAnswer" && callbacks.getWebRTCAnswer) {
+    const data = await callbacks.getWebRTCAnswer(payload.deviceId, payload.value.offer);
+
+    if (data.answer) {
+      return data.answer;
+    }
+    throw new InvalidResponseError(" error");
+  } 
+  if (payload.action === "getWebRTCOffer" && callbacks.getWebRTCOffer) {
+    const data = await callbacks.getWebRTCOffer(payload.deviceId);
+
+    if (data.offer) {
+      return data.offer;
+    }
+    throw new InvalidResponseError(" error");
+  } 
+  else if (payload.action === "getCameraStreamUrl" && callbacks.getCameraStreamUrl) {
+    const data = await callbacks.getCameraStreamUrl(payload.deviceId, payload.value.protocol);
+    if (data.url) {
+      return data.url;
+    }
+    throw new InvalidResponseError("getCameraStreamUrl error");
+  } else {
+    throw new UndefinedCallbackError("getCameraStreamUrl callback is undefined.");
+  }
+};
+
+module.exports = {
+  CameraStreamController,
+};

package/lib/contorllers/sensors_controller.js

@@ -31,6 +31,16 @@ const ThermoStatTemperature = async (payload, callbacks) => {
   }
 };
 
+const AdjustTargetTemperature = async (payload, callbacks) => {  
+  if (callbacks.adjustTargetTemperature) {
+    const resp = await callbacks.adjustTargetTemperature(payload.deviceId, payload.value.temperature);
+    if (resp.temperature) return resp;
+    throw new InvalidResponseError('Thermostat temperature undefined');
+  } else {
+    throw new UndefinedCallbackError('adjustTargetTemperature callback is undefined.');
+  }
+};
+
 const Lock = async (payload, callbacks) => {
   if (callbacks.setLockState) {
     const resp = await callbacks.setLockState(payload.deviceId, payload.value.state);
@@ -41,4 +51,4 @@ const Lock = async (payload, callbacks) => {
   }
 };
 
-module.exports = { ThermoStatMode, ThermoStatTemperature, Lock };
+module.exports = { ThermoStatMode, ThermoStatTemperature, Lock, AdjustTargetTemperature };

package/lib/events/event_handler.js

@@ -1,4 +1,3 @@
-
 /*
  *  Copyright (c) 2019 Sinric. All rights reserved.
  *  Licensed under Creative Commons Attribution-Share Alike (CC BY-SA)
@@ -6,9 +5,9 @@
  *  This file is part of the Sinric Pro (https://github.com/sinricpro/)
  */
 
-const uuidv4 = require('uuid/v4');
-const { RateLimiterMemory, BurstyRateLimiter } = require('rate-limiter-flexible');
-const { getSignature } = require('../signature');
+const uuidv4 = require("uuid/v4");
+const { RateLimiterMemory, BurstyRateLimiter } = require("rate-limiter-flexible");
+const { getSignature } = require("../signature");
 
 /*
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -28,37 +27,47 @@ const burstyLimiter = new BurstyRateLimiter(
     duration: 60,
   }),
   new RateLimiterMemory({
-    keyPrefix: 'burst',
+    keyPrefix: "burst",
     points: 10,
     duration: 60,
-  }),
+  })
 );
 
 // @TODO resteBands
 
 const eventNames = {
-  powerState: 'setPowerState',
-  setBrightness: 'setBrightness',
-  powerLevel: 'setPowerLevel',
-  color: 'setColor',
-  colorTemperature: 'setColorTemperature',
-  doorBell: 'DoorbellPress',
-  thermostatMode: 'setThermostatMode',
-  rangvalue: 'setRangeValue',
-  motion: 'motion',
-  contact: 'setContactState',
-  setVolume: 'setVolume',
-  selectInput: 'selectInput',
-  media: 'mediaControl',
-  channel: 'changeChannel',
-  mode: 'setMode',
-  lock: 'setLockState',
-  mute: 'setMute',
-  currentTemperature: 'currentTemperature',
-  pushNotification: 'pushNotification',
+  powerState: "setPowerState",
+  setBrightness: "setBrightness",
+  powerLevel: "setPowerLevel",
+  color: "setColor",
+  colorTemperature: "setColorTemperature",
+  doorBell: "DoorbellPress",
+  thermostatMode: "setThermostatMode",
+  rangvalue: "setRangeValue",
+  motion: "motion",
+  contact: "setContactState",
+  setVolume: "setVolume",
+  selectInput: "selectInput",
+  media: "mediaControl",
+  channel: "changeChannel",
+  mode: "setMode",
+  lock: "setLockState",
+  mute: "setMute",
+  currentTemperature: "currentTemperature",
+  pushNotification: "pushNotification",
 };
 
-const actionArr = ['setPowerState', 'setBrightness', 'setPowerLevel', 'setColor', 'setColorTemperature', 'DoorbellPress', 'currentTemperature', 'pushNotification'];
+const actionArr = [
+  "setPowerState",
+  "setBrightness",
+  "setPowerLevel",
+  "setColor",
+  "setColorTemperature",
+  "DoorbellPress",
+  "currentTemperature",
+  "pushNotification",
+  "setThermostatMode",
+];
 
 const getJson = (client, eventName, deviceId, value) => {
   const header = {
@@ -68,30 +77,30 @@ const getJson = (client, eventName, deviceId, value) => {
   const payload = {
     action: eventName,
     cause: {
-      type: 'PHYSICAL_INTERACTION',
+      type: "PHYSICAL_INTERACTION",
     },
     createdAt: Math.round(new Date() / 1000),
     deviceId,
     replyToken: uuidv4(),
-    type: 'event',
+    type: "event",
     value,
   };
   const signature = {
     HMAC: getSignature(client, JSON.stringify(payload)),
   };
 
-  return ({ header, payload, signature });
+  return { header, payload, signature };
 };
 
 const raiseEvent = async (client, eventName, deviceId, value) => {
   if (actionArr.includes(eventName)) {
     try {
-      await burstyLimiter.consume('queue');
+      await burstyLimiter.consume("queue");
       const request = JSON.stringify(getJson(client, eventName, deviceId, value));
-      if (process.env.SR_DEBUG) console.log('>> %j', request);
+      if (process.env.SR_DEBUG) console.log(">> %j", request);
       client.send(request);
     } catch (rlRejected) {
-      console.log('Too many events!');
+      console.log("Too many events!");
     }
   } else {
     console.log(`Invalid Event: ${eventName}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sinricpro",
-  "version": "2.8.1",
+  "version": "2.10.1",
   "description": "Sinric Pro Nodejs SDK",
   "main": "index.js",
   "repository": {

package/lib/contorllers/webrtc_controller.js

@@ -1,21 +0,0 @@
-/*
- *  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/notes-to-aruna.txt

@@ -1,6 +0,0 @@
-Switch to Login module (by typing "how-to-npm" on command line)
-Type "npm adduser" to login
-Type "npm whoami" to confirm if logged in
-Switch back to the package at which you are getting error(my case it was Publish Again)
-Type "npm publish"
-Done