Using encrypted traffic

.gitignore

@@ -49,4 +49,6 @@ node_modules/
 .env.test
 
 # parcel-bundler cache (https://parceljs.org/)
-.cache
+.cache
+
+.env

README.md

@@ -53,14 +53,6 @@ If you want to have manual control over the configuration, add the following con
           streamPassword: "__STREAM_PASSWORD__", // This must be only alphanumeric [A-Za-z0-9], no special characters allowed!
           streamUser: "__STREAM_USER__", // This must be only alphanumeric [A-Za-z0-9], no special characters allowed!
 
-          // Optionals, don't put them in the config if you need the default values
-          pullInterval: 60000, // Numbers of milliseconds after we update accessories by polling
-          disableStreaming: false, // Disables the video feed
-          disablePrivacyAccessory: false, // Disables the privacy accessory
-          disableAlarmAccessory: false, // Disables the alarm accessory
-          disableMotionAccessory: false, // Disables the motion detection sensor
-          lowQuality: false, // Video stream will be requested in low-quality (640x480) instead of HQ (1920x1080)
-
           // An object containing a video-config passed to camera-ffmpeg
           // Please check https://www.npmjs.com/package/homebridge-camera-ffmpeg for all the possible values\
           // Make sure you don't override default values provided by this plugin unless you know what you're doing!

config.schema.json

@@ -27,11 +27,16 @@
             "description": "Set the camera IP address",
             "placeholder": "192.168.0.XXX"
           },
+          "username": {
+            "title": "TAPO username",
+            "type": "string",
+            "description": "Most of the time you should leave this empty, defaulting to admin. If it doesn't work, try to use your streaming username (see below)"
+          },
           "password": {
             "title": "TAPO password",
             "type": "string",
             "required": true,
-            "description": "Password of your TAPO app (not the password for the RTSP configuration)"
+            "description": "Password of your TAPO Cloud (the one you use to login the application, not the password for the RTSP configuration). If it doesn't work, try to use your streaming password (see below)"
           },
           "streamUser": {
             "title": "Stream User",
@@ -81,7 +86,19 @@
             "title": "Low Quality",
             "type": "boolean",
             "description": "Video stream will be requested in low-quality (640x480) instead of HQ (1920x1080)"
-          }
+          },
+          "privacyAccessoryName": {
+            "title": "Privacy Accessory Name",
+            "type": "string",
+            "description": "Name of the Privacy accessory",
+            "placeholder": "Eyes"
+          },
+          "alarmAccessoryName": {
+            "title": "Alarm Accessory Name",
+            "type": "string",
+            "description": "Name of the Alarm accessory",
+            "placeholder": "Alarm"
+          },
         }
       }
     }

package.json

@@ -43,6 +43,7 @@
     "url": "https://www.paypal.me/kopiro"
   },
   "dependencies": {
+    "dotenv": "^16.3.1",
     "homebridge-camera-ffmpeg": "^3.1.4",
     "node-fetch": "^2.6.7",
     "onvif": "^0.6.6"
@@ -56,7 +57,7 @@
     "homebridge": "^1.3.5",
     "nodemon": "^2.0.15",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.5.0",
+    "ts-node": "^10.9.1",
     "typescript": "^4.4.3"
   }
 }

src/cameraAccessory.ts

@@ -1,5 +1,6 @@
 import {
   API,
+  Characteristic,
   Logging,
   PlatformAccessory,
   PlatformAccessoryEvent,
@@ -9,13 +10,14 @@
 import { Logger } from "homebridge-camera-ffmpeg/dist/logger";
 import { TAPOCamera } from "./tapoCamera";
 import { PLUGIN_ID } from "./pkg";
-import { DeviceInformation } from "onvif";
+import { DeviceInformation } from "./types/onvif";
 import { CameraPlatform } from "./cameraPlatform";
 import { VideoConfig } from "homebridge-camera-ffmpeg/dist/configTypes";
 
 export type CameraConfig = {
   name: string;
   ipAddress: string;
+  username: string;
   password: string;
   streamUser: string;
   streamPassword: string;
@@ -28,6 +30,9 @@
   lowQuality?: boolean;
 
   videoConfig?: VideoConfig;
+
+  privacyAccessoryName?: string;
+  alarmAccessoryName?: string;
 };
 
 export class CameraAccessory {
@@ -79,12 +84,13 @@
   }
 
   private setupAlarmAccessory() {
-    const name = `${this.config.name} - Alarm`;
-    this.alarmService = this.accessory.addService(
-      this.api.hap.Service.Switch,
-      name,
-      "alarm"
+    const name = this.config.alarmAccessoryName || "Alarm";
+    this.alarmService = new this.api.hap.Service.Switch(name, "alarm");
+    this.alarmService.setCharacteristic(
+      this.api.hap.Characteristic.ConfiguredName,
+      name
     );
+    this.alarmService = this.accessory.addService(this.alarmService);
     this.alarmService
       .getCharacteristic(this.api.hap.Characteristic.On)
       .onGet(() => {
@@ -96,7 +102,7 @@
         return this.cameraStatus.alert;
       })
       .onSet((status) => {
-        this.log.debug(`Setting alarm to ${status ? "on" : "off"}`);
+        this.log.info(`Setting alarm to ${status ? "on" : "off"}`);
         this.camera.setAlertConfig(Boolean(status)).catch((err) => {
           this.log.error(
             `[${this.config.name}]`,
@@ -109,12 +115,14 @@
   }
 
   private setupPrivacyModeAccessory() {
-    const name = `${this.config.name} - Eyes`;
-    this.privacyService = this.accessory.addService(
-      this.api.hap.Service.Switch,
-      name,
-      "eyes"
+    const name = this.config.privacyAccessoryName || "Eyes";
+    this.privacyService = new this.api.hap.Service.Switch(name, "privacy");
+    this.privacyService.setCharacteristic(
+      this.api.hap.Characteristic.ConfiguredName,
+      name
     );
+    this.accessory.addService(this.privacyService);
+
     this.privacyService
       .getCharacteristic(this.api.hap.Characteristic.On)
       .onGet(async () => {
@@ -126,7 +134,7 @@
         return !this.cameraStatus.lensMask;
       })
       .onSet((status) => {
-        this.log.debug(`Setting privacy to ${status ? "on" : "off"}`);
+        this.log.info(`Setting privacy to ${status ? "on" : "off"}`);
         this.camera.setLensMaskConfig(!status).catch((err) => {
           this.log.error(
             `[${this.config.name}]`,