Add new Blinds Accessory for controlling roller motor shades

config.schema.json

@@ -96,6 +96,12 @@
                       "SimpleBlinds"
                     ]
                   },
+                  {
+                    "title": "Simple Blinds 2",
+                    "enum": [
+                      "SimpleBlinds2"
+                    ]
+                  },
                   {
                     "title": "Smart Plug w/ White and Color Lights",
                     "enum": [
@@ -379,11 +385,25 @@
                   "functionBody": "return model.devices && model.devices[arrayIndices] && ['Convector', 'SimpleHeater'].includes(model.devices[arrayIndices].type);"
                 }
               },
+              "dpLightOn": {
+                "type": "integer",
+                "placeholder": "9",
+                "condition": {
+                  "functionBody": "return model.devices && model.devices[arrayIndices] && ['Fan', 'FanLight'].includes(model.devices[arrayIndices].type);"
+                }
+              },
+              "dpFanOn": {
+                "type": "integer",
+                "placeholder": "1",
+                "condition": {
+                  "functionBody": "return model.devices && model.devices[arrayIndices] && ['Fan', 'FanLight'].includes(model.devices[arrayIndices].type);"
+                }
+              },
               "dpRotationSpeed": {
                 "type": "integer",
                 "placeholder": "4",
                 "condition": {
-                  "functionBody": "return model.devices && model.devices[arrayIndices] && ['Convector'].includes(model.devices[arrayIndices].type);"
+                  "functionBody": "return model.devices && model.devices[arrayIndices] && ['Convector', 'Fan', 'FanLight'].includes(model.devices[arrayIndices].type);"
                 }
               },
               "maxSpeed": {
@@ -400,6 +420,13 @@
                   "functionBody": "return model.devices && model.devices[arrayIndices] && ['Fan', 'FanLight'].includes(model.devices[arrayIndices].type);"
                 }
               },
+              "useStrings": {
+                "type": "boolean",
+                "placeholder": true,
+                "condition": {
+                  "functionBody": "return model.devices && model.devices[arrayIndices] && ['Fan', 'FanLight'].includes(model.devices[arrayIndices].type);"
+                }
+              },
               "dpChildLock": {
                 "type": "integer",
                 "placeholder": "6",
@@ -508,6 +535,20 @@
                 "condition": {
                   "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleBlinds'].includes(model.devices[arrayIndices].type);"
                 }
+              },
+              "dpControl": {
+                "type": "integer",
+                "placeholder": 1,
+                "condition": {
+                  "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleBlinds2'].includes(model.devices[arrayIndices].type);"
+                }
+              },
+              "dpPosition": {
+                "type": "integer",
+                "placeholder": 2,
+                "condition": {
+                  "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleBlinds2'].includes(model.devices[arrayIndices].type);"
+                }
               }
             }
           }

index.js

@@ -16,12 +16,14 @@ const GarageDoorAccessory = require('./lib/GarageDoorAccessory');
 const SimpleDimmerAccessory = require('./lib/SimpleDimmerAccessory');
 const SimpleDimmer2Accessory = require('./lib/SimpleDimmer2Accessory');
 const SimpleBlindsAccessory = require('./lib/SimpleBlindsAccessory');
+const SimpleBlinds2Accessory = require('./lib/SimpleBlinds2Accessory');
 const SimpleHeaterAccessory = require('./lib/SimpleHeaterAccessory');
 const SimpleFanAccessory = require('./lib/SimpleFanAccessory');
 const SimpleFanLightAccessory = require('./lib/SimpleFanLightAccessory');
 const SwitchAccessory = require('./lib/SwitchAccessory');
 const ValveAccessory = require('./lib/ValveAccessory');
 const OilDiffuserAccessory = require('./lib/OilDiffuserAccessory');
+const DoorbellAccessory = require('./lib/DoorbellAccessory');
 
 const PLUGIN_NAME = 'homebridge-tuya';
 const PLATFORM_NAME = 'TuyaLan';
@@ -42,12 +44,14 @@ const CLASS_DEF = {
     simpledimmer: SimpleDimmerAccessory,
     simpledimmer2: SimpleDimmer2Accessory,
     simpleblinds: SimpleBlindsAccessory,
+    simpleblinds2: SimpleBlinds2Accessory,
     simpleheater: SimpleHeaterAccessory,
     switch: SwitchAccessory,
     fan: SimpleFanAccessory,
     fanlight: SimpleFanLightAccessory,
     watervalve: ValveAccessory,
-    oildiffuser: OilDiffuserAccessory
+    oildiffuser: OilDiffuserAccessory,
+    doorbell: DoorbellAccessory
 };
 
 let Characteristic, PlatformAccessory, Service, Categories, AdaptiveLightingController, UUID;

lib/DoorbellAccessory.js

@@ -0,0 +1,208 @@
+const BaseAccessory = require('./BaseAccessory');
+const async = require('async');
+const https = require('https');
+const url = require('url');
+
+const DP_DOORBELL = '154'; // provides base64-encoded URL of static image
+const DP_DOOR = '148'; // provides boolean of whether the switch is toggled
+const DP_GATE = '232'; // provides boolean of whether the switch is toggled 
+
+const LOCK_TIMEOUT = 5000;
+
+class DoorbellDelegate /*extends CameraStreamingDelegate*/ {
+
+    constructor() {
+        this.cameraImage = undefined;
+    }
+
+    setCameraImage(image) {
+      this.cameraImage = image;
+    }
+
+    storeImage(urlString, callback) {
+        const urlObject = url.parse(urlString);
+        const me = this;
+        https.get(urlObject, 
+            function(res) {
+                var body=Buffer.alloc(0);
+
+                if (res.statusCode!==200) {
+                    return console.error('HTTP '+res.statusCode);
+                }
+
+                res.on('data', function(chunk) {
+                    body=Buffer.concat([body, chunk]);
+                });
+
+                res.on('end', function() {
+                    me.setCameraImage(body);
+                    console.log("Image stored");
+                    callback();
+                    console.log("Callback after image store complete");
+                });
+
+                res.on('error', function(err) {
+                    console.error(err);
+                });
+            }
+        );
+    }
+
+    /* SnapshotRequest, SnapshotRequestCallback (function taking error or HAPStatus and Buffer), returns void */
+    handleSnapshotRequest(request, callback) {
+        //TODO honour the image size in the request (SnapshotRequest).
+        callback(undefined, this.cameraImage);
+    }
+
+
+    /* PrepareStreamRequest, PrepareStreamCallback (function taking optional error and PrepareStreamResponse), returns void */
+    prepareStream(request, callback) {
+
+    }
+
+    /* StreamingRequest, StreamRequestCallback (function taking optional Error), returns void */
+    handleStreamRequest(request, callback) {
+
+    }
+}
+
+class DoorbellAccessory extends BaseAccessory {
+
+    static getCategory(Categories) {
+        return Categories.CAMERA;
+    }
+
+    constructor(...props) {
+        super(...props);
+    }
+
+    _registerPlatformAccessory() {
+        const {Service, Characteristic} = this.hap;
+
+        const doorbellService = this.accessory.getService(Service.Doorbell) || this.accessory.addService(Service.Doorbell);
+        this._checkServiceName(doorbellService, this.device.context.name);
+
+        doorbellService.setPrimaryService(true);
+        super._registerPlatformAccessory();
+    }
+
+
+    _registerCharacteristics(dps) {
+        const {Service, Characteristic} = this.hap;
+
+        this.configureCamera();
+
+        const service = this.accessory.getService(Service.Doorbell);
+
+
+        this.device.on('change', (changes, state) => {
+            //console.log(`Changes: ${JSON.stringify(changes)}, State: ${JSON.stringify(state)}`);
+
+            if (changes.hasOwnProperty(DP_DOORBELL)) {
+                const urlBase64 = changes[DP_DOORBELL];
+                const strUrl = Buffer.from(urlBase64, 'base64');
+                //console.log(`Image URL: ${strUrl}`);
+
+                this.streamingDelegate.storeImage(strUrl.toString(), () => {
+                  service.updateCharacteristic(Characteristic.ProgrammableSwitchEvent, Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS);
+                  });
+            }
+
+            if (changes.hasOwnProperty(DP_DOOR)) {
+                console.log("Door button pressed");
+            }
+
+            if (changes.hasOwnProperty(DP_GATE)) {
+                console.log("Gate button pressed");
+            }
+        });
+    }
+
+    configureCamera() {
+        this.streamingDelegate = new DoorbellDelegate();
+        console.log("created streaming delegate");
+        const options = {
+          cameraStreamCount: 1, 
+          delegate: this.streamingDelegate,
+          streamingOptions: {
+            supportedCryptoSuites: [this.hap.SRTPCryptoSuites.AES_CM_128_HMAC_SHA1_80],
+            video: {
+              resolutions: [
+                [320, 180, 30],
+                [320, 240, 15], // Apple Watch requires this configuration
+                [320, 240, 30],
+                [480, 270, 30],
+                [480, 360, 30],
+                [640, 360, 30],
+                [640, 480, 30],
+                [1280, 720, 30],
+                [1280, 960, 30],
+                [1920, 1080, 30],
+                [1600, 1200, 30],
+              ],
+              codec: {
+                profiles: [this.hap.H264Profile.BASELINE, this.hap.H264Profile.MAIN, this.hap.H264Profile.HIGH],
+                levels: [this.hap.H264Level.LEVEL3_1, this.hap.H264Level.LEVEL3_2, this.hap.H264Level.LEVEL4_0],
+              },
+            },
+            audio: {
+              twoWayAudio: true,
+              codecs: [
+                {
+                  type: this.hap.AudioStreamingCodecType.AAC_ELD,
+                  samplerate: this.hap.AudioStreamingSamplerate.KHZ_16,
+                },
+              ],
+            },
+          },
+        };
+
+        //console.log("created options");
+        const cameraController = new this.hap.CameraController(options);
+        //console.log("created controller");
+
+        this.accessory.configureController(cameraController);
+        //console.log("configured controller with accessory");
+    }
+
+    pushDoor(callback) {
+        this.device.update({[DP_DOOR.toString()] : !Boolean(this.device.state[DP_DOOR])});
+    }
+
+    pushGate(callback) {
+        this.setState(DP_GATE, !Boolean(this.device.state[DP_GATE]));
+    }
+
+
+    handleLockCurrentStateGet() {
+        return this.doorState;
+      }
+
+      handleLockTargetStateGet() {
+        return this.doorState;
+      }
+
+      async handleLockTargetStateSet(value) {
+        const {Service, Characteristic} = this.hap;
+        const service = this.accessory.getService(Service.LockMechanism);
+
+        try {
+          this.pushDoor();
+
+          service.getCharacteristic(Characteristic.LockCurrentState).updateValue(value);
+          service.getCharacteristic(Characteristic.LockTargetState).updateValue(value);
+          this.doorState = value;
+
+          setTimeout(() => {
+            service.getCharacteristic(Characteristic.LockCurrentState).updateValue(Characteristic.LockCurrentState.SECURED);
+            service.getCharacteristic(Characteristic.LockTargetState).updateValue(Characteristic.LockTargetState.SECURED);
+            this.doorState = Characteristic.LockTargetState.SECURED;
+          }, LOCK_TIMEOUT);
+        } catch (error) {
+          this.log.error('Unlock failed', error);
+        }
+      }
+
+}
+
+module.exports = DoorbellAccessory;