@homebridge-plugins/homebridge-tuya 3.0.0-beta.2 → 3.0.0-beta.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +354 -142
- package/config.schema.json +1221 -893
- package/dist/cloud/api/TuyaOpenAPI.js +108 -60
- package/dist/cloud/api/TuyaOpenAPI.js.map +1 -1
- package/dist/cloud/api/TuyaOpenMQ.js +45 -22
- package/dist/cloud/api/TuyaOpenMQ.js.map +1 -1
- package/dist/cloud/device/{TuyaDeviceManager.js → TuyaCloudDeviceManager.js} +146 -96
- package/dist/cloud/device/TuyaCloudDeviceManager.js.map +1 -0
- package/dist/cloud/device/TuyaCustomDeviceManager.js +75 -5
- package/dist/cloud/device/TuyaCustomDeviceManager.js.map +1 -1
- package/dist/cloud/device/TuyaDevice.js.map +1 -1
- package/dist/cloud/device/TuyaHomeDeviceManager.js +81 -13
- package/dist/cloud/device/TuyaHomeDeviceManager.js.map +1 -1
- package/dist/config.js +26 -5
- package/dist/config.js.map +1 -1
- package/dist/local/DynamicChildDiscovery.js +2 -1
- package/dist/local/DynamicChildDiscovery.js.map +1 -1
- package/dist/local/LocalDevice.js +16 -3
- package/dist/local/LocalDevice.js.map +1 -1
- package/dist/local/LocalDeviceManager.js +361 -164
- package/dist/local/LocalDeviceManager.js.map +1 -1
- package/dist/local/TuyaDiscovery.js +16 -7
- package/dist/local/TuyaDiscovery.js.map +1 -1
- package/dist/local/ZigbeeGatewayDetection.js +7 -4
- package/dist/local/ZigbeeGatewayDetection.js.map +1 -1
- package/dist/local/protocol/ProtocolUtilities.js +34 -17
- package/dist/local/protocol/ProtocolUtilities.js.map +1 -1
- package/dist/local/protocol/ProtocolV31V32.js +4 -2
- package/dist/local/protocol/ProtocolV31V32.js.map +1 -1
- package/dist/local/protocol/ProtocolV33.js +4 -2
- package/dist/local/protocol/ProtocolV33.js.map +1 -1
- package/dist/local/protocol/ProtocolV34.js +10 -5
- package/dist/local/protocol/ProtocolV34.js.map +1 -1
- package/dist/local/protocol/ProtocolV35.js +8 -4
- package/dist/local/protocol/ProtocolV35.js.map +1 -1
- package/dist/platform.js +253 -493
- package/dist/platform.js.map +1 -1
- package/dist/settings.js +0 -2
- package/dist/settings.js.map +1 -1
- package/dist/shared/TuyaDeviceManager.js +147 -0
- package/dist/shared/TuyaDeviceManager.js.map +1 -0
- package/dist/shared/TuyaHybridDeviceManager.js +215 -0
- package/dist/shared/TuyaHybridDeviceManager.js.map +1 -0
- package/dist/shared/accessory/AccessoryFactory.js +350 -0
- package/dist/shared/accessory/AccessoryFactory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/AirConditionerAccessory.js +21 -15
- package/dist/shared/accessory/AirConditionerAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/AirPurifierAccessory.js.map +1 -1
- package/dist/shared/accessory/AirQualitySensorAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/BaseAccessory.js +16 -95
- package/dist/shared/accessory/BaseAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/BlindsAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/CameraAccessory.js +2 -2
- package/dist/shared/accessory/CameraAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/CarbonDioxideSensorAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/CarbonMonoxideSensorAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/ContactSensorAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/DehumidifierAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/DiffuserAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/DimmerAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/DoorbellAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/ExtractionHoodAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/FanAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/GarageDoorAccessory.js +19 -2
- package/dist/shared/accessory/GarageDoorAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/HeaterAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/HeaterAccessory_old.js.map +1 -1
- package/dist/shared/accessory/HumanPresenceSensorAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/HumidifierAccessory.js.map +1 -1
- package/dist/shared/accessory/IRAdapter.js +167 -0
- package/dist/shared/accessory/IRAdapter.js.map +1 -0
- package/dist/shared/accessory/IRAirConditionerAccessory.js.map +1 -0
- package/dist/shared/accessory/IRControlHubAccessory.js.map +1 -0
- package/dist/shared/accessory/IRControlHubSubAccessory.js.map +1 -0
- package/dist/shared/accessory/IRFanAccessory.js +90 -0
- package/dist/shared/accessory/IRFanAccessory.js.map +1 -0
- package/dist/shared/accessory/IRGenericAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/LeakSensorAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/LightAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/LightSensorAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/LocationWeatherAccessory.js +1 -1
- package/dist/shared/accessory/LocationWeatherAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/LockAccessory.js +3 -3
- package/dist/shared/{accessories → accessory}/LockAccessory.js.map +1 -1
- package/dist/shared/accessory/MotionSensorAccessory.js.map +1 -0
- package/dist/shared/accessory/OutletAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/PetFeederAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/SceneAccessory.js +1 -1
- package/dist/shared/accessory/SceneAccessory.js.map +1 -0
- package/dist/shared/accessory/SceneSwitchAccessory.js.map +1 -0
- package/dist/shared/accessory/SecuritySystemAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/SmokeSensorAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/SwitchAccessory.js +1 -45
- package/dist/shared/accessory/SwitchAccessory.js.map +1 -0
- package/dist/shared/accessory/TemperatureHumiditySensorAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/ThermostatAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/TowerRackAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/ValveAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/VibrationSensorAccessory.js.map +1 -1
- package/dist/shared/accessory/WeatherStationAccessory.js.map +1 -0
- package/dist/shared/accessory/WetBulbGlobeTemperatureAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/WhiteNoiseLightAccessory.js +1 -0
- package/dist/shared/accessory/WhiteNoiseLightAccessory.js.map +1 -0
- package/dist/shared/accessory/WindowAccessory.js.map +1 -0
- package/dist/shared/{accessories → accessory}/WindowCoveringAccessory.js.map +1 -1
- package/dist/shared/{accessories → accessory}/WirelessSwitchAccessory.js.map +1 -1
- package/dist/shared/accessory/characteristic/Active.js.map +1 -0
- package/dist/shared/accessory/characteristic/AirQuality.js.map +1 -0
- package/dist/shared/{accessories → accessory}/characteristic/CurrentRelativeHumidity.js +3 -0
- package/dist/shared/accessory/characteristic/CurrentRelativeHumidity.js.map +1 -0
- package/dist/shared/accessory/characteristic/CurrentTemperature.js.map +1 -0
- package/dist/shared/accessory/characteristic/CurrentWeather.js.map +1 -0
- package/dist/shared/accessory/characteristic/CurrentWeatherByOpenMeteo.js.map +1 -0
- package/dist/shared/{accessories → accessory}/characteristic/CurrentWetBulbGlobeTemperature.js +3 -2
- package/dist/shared/accessory/characteristic/CurrentWetBulbGlobeTemperature.js.map +1 -0
- package/dist/shared/{accessories → accessory}/characteristic/EnergyUsage.js +0 -5
- package/dist/shared/accessory/characteristic/EnergyUsage.js.map +1 -0
- package/dist/shared/{accessories → accessory}/characteristic/Light.js +28 -5
- package/dist/shared/accessory/characteristic/Light.js.map +1 -0
- package/dist/shared/accessory/characteristic/LightSensor.js.map +1 -0
- package/dist/shared/{accessories → accessory}/characteristic/LockPhysicalControls.js +3 -0
- package/dist/shared/accessory/characteristic/LockPhysicalControls.js.map +1 -0
- package/dist/shared/accessory/characteristic/MotionDetected.js.map +1 -0
- package/dist/shared/accessory/characteristic/Name.js.map +1 -0
- package/dist/shared/accessory/characteristic/OccupancyDetected.js.map +1 -0
- package/dist/shared/{accessories → accessory}/characteristic/On.js +1 -0
- package/dist/shared/accessory/characteristic/On.js.map +1 -0
- package/dist/shared/accessory/characteristic/OutletInUse.js.map +1 -0
- package/dist/shared/accessory/characteristic/ProgrammableSwitchEvent.js.map +1 -0
- package/dist/shared/{accessories → accessory}/characteristic/RelativeHumidityDehumidifierThreshold.js +3 -0
- package/dist/shared/accessory/characteristic/RelativeHumidityDehumidifierThreshold.js.map +1 -0
- package/dist/shared/accessory/characteristic/RotationSpeed.js.map +1 -0
- package/dist/shared/accessory/characteristic/SecuritySystemState.js.map +1 -0
- package/dist/shared/{accessories → accessory}/characteristic/SwingMode.js +3 -0
- package/dist/shared/accessory/characteristic/SwingMode.js.map +1 -0
- package/dist/shared/accessory/characteristic/TargetTemperature.js.map +1 -0
- package/dist/shared/accessory/characteristic/TemperatureDisplayUnits.js.map +1 -0
- package/dist/shared/util/ConfigHash.js +2 -2
- package/dist/shared/util/ConfigHash.js.map +1 -1
- package/dist/shared/util/ConfigMigrator.js +222 -0
- package/dist/shared/util/ConfigMigrator.js.map +1 -0
- package/dist/shared/util/FfmpegStreamingProcess.js +62 -0
- package/dist/shared/util/FfmpegStreamingProcess.js.map +1 -1
- package/dist/shared/util/InfraredTool.js +0 -2
- package/dist/shared/util/InfraredTool.js.map +1 -1
- package/dist/shared/util/Logger.js +85 -10
- package/dist/shared/util/Logger.js.map +1 -1
- package/dist/shared/util/TuyaStreamDelegate.js +194 -97
- package/dist/shared/util/TuyaStreamDelegate.js.map +1 -1
- package/dist/shared/util/util.js +59 -4
- package/dist/shared/util/util.js.map +1 -1
- package/docs/ADVANCED_OPTIONS.md +603 -0
- package/docs/CONFIG_GUIDE.md +616 -0
- package/docs/Get-Local-Keys-for-Your-Devices.md +246 -0
- package/{SUPPORTED_DEVICES.md → docs/SUPPORTED_DEVICES.md} +24 -3
- package/eslint.config.mjs +0 -1
- package/{jest.config.js → jest.config.ts} +5 -2
- package/package.json +12 -9
- package/test/ConfigMigrator.test.ts +1060 -0
- package/test/Logger.test.ts +482 -0
- package/test/accessoryFactory.data.test.ts +172 -0
- package/test/accessoryFactory.test.ts +64 -35
- package/test/airConditioner.test.ts +742 -0
- package/test/config.test.ts +17 -13
- package/test/custom.test.ts +2 -2
- package/test/errorHandling.test.ts +12 -12
- package/test/home.test.ts +1 -1
- package/test/hybridDeviceManager.test.ts +808 -0
- package/test/light.test.ts +250 -0
- package/test/localDevice.test.ts +21 -50
- package/test/localDeviceManager.behavior.test.ts +196 -31
- package/test/localDeviceManager.test.ts +124 -41
- package/test/mqttMessages.test.ts +33 -14
- package/test/platform.test.ts +337 -814
- package/test/platform.validation.local.test.ts +58 -119
- package/test/tuyaCustomDeviceManager.test.ts +106 -16
- package/test/tuyaDeviceManager.test.ts +636 -639
- package/test/tuyaDiscovery.test.ts +21 -33
- package/test/tuyaHomeDeviceManager.test.ts +109 -18
- package/test/tuyaOpenAPI.test.ts +25 -44
- package/test/tuyaOpenMQ.test.ts +15 -23
- package/test/util.test.ts +107 -7
- package/test/zigbee/LocalDevice.zigbee.test.ts +14 -18
- package/test/zigbee/LocalDeviceManager.cloud-discovery.test.ts +19 -20
- package/test/zigbee/LocalDeviceManager.zigbee.reconnect.test.ts +19 -20
- package/test/zigbee/LocalDeviceManager.zigbee.test.ts +73 -35
- package/test/zigbee/ZigbeeGatewayDetection.test.ts +2 -2
- package/ADVANCED_OPTIONS.md +0 -267
- package/dist/cloud/device/TuyaDeviceManager.js.map +0 -1
- package/dist/local/CloudLocalReconciliation.js +0 -180
- package/dist/local/CloudLocalReconciliation.js.map +0 -1
- package/dist/shared/AccessoryFactory.js +0 -276
- package/dist/shared/AccessoryFactory.js.map +0 -1
- package/dist/shared/accessories/AccessoryFactory.js +0 -305
- package/dist/shared/accessories/AccessoryFactory.js.map +0 -1
- package/dist/shared/accessories/AirConditionerAccessory.js.map +0 -1
- package/dist/shared/accessories/AirQualitySensorAccessory.js.map +0 -1
- package/dist/shared/accessories/BaseAccessory.js.map +0 -1
- package/dist/shared/accessories/CameraAccessory.js.map +0 -1
- package/dist/shared/accessories/GarageDoorAccessory.js.map +0 -1
- package/dist/shared/accessories/HumanPresenceSensorAccessory.js.map +0 -1
- package/dist/shared/accessories/IRAirConditionerAccessory.js.map +0 -1
- package/dist/shared/accessories/IRControlHubAccessory.js.map +0 -1
- package/dist/shared/accessories/IRControlHubSubAccessory.js.map +0 -1
- package/dist/shared/accessories/IRGenericAccessory.js.map +0 -1
- package/dist/shared/accessories/LocationWeatherAccessory.js.map +0 -1
- package/dist/shared/accessories/MotionSensorAccessory.js.map +0 -1
- package/dist/shared/accessories/OutletAccessory.js.map +0 -1
- package/dist/shared/accessories/SceneAccessory.js.map +0 -1
- package/dist/shared/accessories/SceneSwitchAccessory.js.map +0 -1
- package/dist/shared/accessories/SecuritySystemAccessory.js.map +0 -1
- package/dist/shared/accessories/SwitchAccessory.js.map +0 -1
- package/dist/shared/accessories/TemperatureHumiditySensorAccessory.js.map +0 -1
- package/dist/shared/accessories/WeatherStationAccessory.js.map +0 -1
- package/dist/shared/accessories/WetBulbGlobeTemperatureAccessory.js.map +0 -1
- package/dist/shared/accessories/WhiteNoiseLightAccessory.js.map +0 -1
- package/dist/shared/accessories/WindowAccessory.js.map +0 -1
- package/dist/shared/accessories/characteristic/Active.js.map +0 -1
- package/dist/shared/accessories/characteristic/AirQuality.js.map +0 -1
- package/dist/shared/accessories/characteristic/CurrentRelativeHumidity.js.map +0 -1
- package/dist/shared/accessories/characteristic/CurrentTemperature.js.map +0 -1
- package/dist/shared/accessories/characteristic/CurrentWeather.js.map +0 -1
- package/dist/shared/accessories/characteristic/CurrentWeatherByOpenMeteo.js.map +0 -1
- package/dist/shared/accessories/characteristic/CurrentWetBulbGlobeTemperature.js.map +0 -1
- package/dist/shared/accessories/characteristic/EnergyUsage.js.map +0 -1
- package/dist/shared/accessories/characteristic/Light.js.map +0 -1
- package/dist/shared/accessories/characteristic/LightSensor.js.map +0 -1
- package/dist/shared/accessories/characteristic/LockPhysicalControls.js.map +0 -1
- package/dist/shared/accessories/characteristic/MotionDetected.js.map +0 -1
- package/dist/shared/accessories/characteristic/Name.js.map +0 -1
- package/dist/shared/accessories/characteristic/OccupancyDetected.js.map +0 -1
- package/dist/shared/accessories/characteristic/On.js.map +0 -1
- package/dist/shared/accessories/characteristic/OutletInUse.js.map +0 -1
- package/dist/shared/accessories/characteristic/ProgrammableSwitchEvent.js.map +0 -1
- package/dist/shared/accessories/characteristic/RelativeHumidityDehumidifierThreshold.js.map +0 -1
- package/dist/shared/accessories/characteristic/RotationSpeed.js.map +0 -1
- package/dist/shared/accessories/characteristic/SecuritySystemState.js.map +0 -1
- package/dist/shared/accessories/characteristic/SwingMode.js.map +0 -1
- package/dist/shared/accessories/characteristic/TargetTemperature.js.map +0 -1
- package/dist/shared/accessories/characteristic/TemperatureDisplayUnits.js.map +0 -1
- package/test/zigbee/CloudLocalReconciliation.test.ts +0 -284
- package/tuya-local-configs/dev-1.hash +0 -1
- package/tuya-local-configs/device1.hash +0 -1
- package/wiki/Get-Local-Keys-for-Your-Devices.md +0 -85
- /package/dist/shared/{accessories → accessory}/AirPurifierAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/AirQualitySensorAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/BlindsAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/CarbonDioxideSensorAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/CarbonMonoxideSensorAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/ContactSensorAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/DehumidifierAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/DiffuserAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/DimmerAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/DoorbellAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/ExtractionHoodAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/FanAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/HeaterAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/HeaterAccessory_old.js +0 -0
- /package/dist/shared/{accessories → accessory}/HumanPresenceSensorAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/HumidifierAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/IRAirConditionerAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/IRControlHubAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/IRControlHubSubAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/IRGenericAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/LeakSensorAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/LightAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/LightSensorAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/MotionSensorAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/OutletAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/PetFeederAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/SceneSwitchAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/SecuritySystemAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/SmokeSensorAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/TemperatureHumiditySensorAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/ThermostatAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/TowerRackAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/ValveAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/VibrationSensorAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/WeatherStationAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/WetBulbGlobeTemperatureAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/WindowAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/WindowCoveringAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/WirelessSwitchAccessory.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/Active.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/AirQuality.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/CurrentTemperature.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/CurrentWeather.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/CurrentWeatherByOpenMeteo.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/LightSensor.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/MotionDetected.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/Name.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/OccupancyDetected.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/OutletInUse.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/ProgrammableSwitchEvent.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/RotationSpeed.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/SecuritySystemState.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/TargetTemperature.js +0 -0
- /package/dist/shared/{accessories → accessory}/characteristic/TemperatureDisplayUnits.js +0 -0
|
@@ -36,52 +36,98 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
const events_1 = __importDefault(require("events"));
|
|
40
39
|
const TuyaOpenMQ_1 = __importDefault(require("../api/TuyaOpenMQ"));
|
|
41
|
-
const
|
|
40
|
+
const TuyaDeviceManager_1 = __importDefault(require("../../shared/TuyaDeviceManager"));
|
|
42
41
|
const TuyaDevice_1 = __importStar(require("./TuyaDevice"));
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
Events["DEVICE_ADD"] = "DEVICE_ADD";
|
|
46
|
-
Events["DEVICE_INFO_UPDATE"] = "DEVICE_INFO_UPDATE";
|
|
47
|
-
Events["DEVICE_STATUS_UPDATE"] = "DEVICE_STATUS_UPDATE";
|
|
48
|
-
Events["DEVICE_DELETE"] = "DEVICE_DELETE";
|
|
49
|
-
})(Events || (Events = {}));
|
|
42
|
+
const config_1 = require("../../config");
|
|
43
|
+
const ConfigHash_1 = require("../../shared/util/ConfigHash");
|
|
50
44
|
var TuyaMQTTProtocol;
|
|
51
45
|
(function (TuyaMQTTProtocol) {
|
|
52
46
|
TuyaMQTTProtocol[TuyaMQTTProtocol["DEVICE_STATUS_UPDATE"] = 4] = "DEVICE_STATUS_UPDATE";
|
|
53
47
|
TuyaMQTTProtocol[TuyaMQTTProtocol["DEVICE_INFO_UPDATE"] = 20] = "DEVICE_INFO_UPDATE";
|
|
54
48
|
})(TuyaMQTTProtocol || (TuyaMQTTProtocol = {}));
|
|
55
|
-
class
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
super();
|
|
49
|
+
class TuyaCloudDeviceManager extends TuyaDeviceManager_1.default {
|
|
50
|
+
constructor(api, config, debug = false) {
|
|
51
|
+
super(debug);
|
|
59
52
|
this.api = api;
|
|
53
|
+
this.config = config;
|
|
60
54
|
this.debug = debug;
|
|
61
55
|
this.ownerIDs = [];
|
|
62
|
-
this.
|
|
63
|
-
const log = this.api.log.log;
|
|
64
|
-
this.log = new Logger_1.PrefixLogger(log, TuyaDeviceManager.name, debug);
|
|
65
|
-
this.mq = new TuyaOpenMQ_1.default(api, log);
|
|
56
|
+
this.mq = new TuyaOpenMQ_1.default(api);
|
|
66
57
|
this.mq.addMessageListener(this.onMQTTMessage.bind(this));
|
|
67
58
|
}
|
|
68
|
-
|
|
69
|
-
const
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
59
|
+
createDeviceConfigHash(device) {
|
|
60
|
+
const deviceConfig = this.getDeviceConfig(device);
|
|
61
|
+
if (!deviceConfig) {
|
|
62
|
+
return '';
|
|
63
|
+
}
|
|
64
|
+
// Check if config has changed since last run
|
|
65
|
+
// Hash the device override fields that affect accessory structure
|
|
66
|
+
const configToHash = {
|
|
67
|
+
deviceId: device.id,
|
|
68
|
+
customCategory: deviceConfig?.category,
|
|
69
|
+
unbridged: deviceConfig?.unbridged ?? false,
|
|
70
|
+
schemaOverrides: deviceConfig?.schema ? JSON.stringify(deviceConfig.schema) : undefined,
|
|
71
|
+
adaptiveLighting: deviceConfig?.adaptiveLighting ?? false,
|
|
72
|
+
};
|
|
73
|
+
return ConfigHash_1.ConfigHash.computeHash(configToHash);
|
|
74
|
+
}
|
|
75
|
+
configDevice(device) {
|
|
76
|
+
const deviceConfig = this.getDeviceConfig(device);
|
|
77
|
+
if (deviceConfig?.category) {
|
|
78
|
+
this.log.warn('Override %o category from %o to %o', device.name, device.category, deviceConfig.category);
|
|
79
|
+
device.category = deviceConfig.category;
|
|
80
|
+
}
|
|
81
|
+
if (deviceConfig?.unbridged) {
|
|
82
|
+
this.log.warn('Unbridge %o category %o', device.name, device.category);
|
|
83
|
+
device.unbridged = deviceConfig.unbridged;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
enableAdaptiveLighting(device) {
|
|
87
|
+
return !!this.getDeviceConfig(device)?.adaptiveLighting;
|
|
88
|
+
}
|
|
89
|
+
enableGarageDoorUseContactSensorForState(device) {
|
|
90
|
+
return this.getDeviceConfig(device)?.garageDoorUseContactSensorForState === true;
|
|
91
|
+
}
|
|
92
|
+
getDeviceConfig(device) {
|
|
93
|
+
if (!this.config) {
|
|
94
|
+
return undefined;
|
|
95
|
+
}
|
|
96
|
+
// Find matching override, respecting source filtering
|
|
97
|
+
const matches = this.config.deviceOverrides?.filter(config => {
|
|
98
|
+
const sourceMatch = [config_1.TuyaPluginMode.cloud, config_1.TuyaPluginMode.both].includes(config.configFor);
|
|
99
|
+
const idMatch = config.id === device.id || config.id === device.uuid ||
|
|
100
|
+
config.id === device.product_id || config.id === 'global';
|
|
101
|
+
return sourceMatch && idMatch;
|
|
102
|
+
}) ?? [];
|
|
103
|
+
// Return device-specific config, then product, then global
|
|
104
|
+
return matches.find(config => config.id === device.id || config.id === device.uuid) ||
|
|
105
|
+
matches.find(config => config.id === device.product_id) ||
|
|
106
|
+
matches.find(config => config.id === 'global');
|
|
81
107
|
}
|
|
82
108
|
getDevice(deviceID) {
|
|
83
109
|
return Array.from(this.devices).find(device => device.id === deviceID);
|
|
84
110
|
}
|
|
111
|
+
getDeviceSchemaConfig(device, dpCode) {
|
|
112
|
+
const deviceConfig = this.getDeviceConfig(device);
|
|
113
|
+
if (!deviceConfig || !deviceConfig.schema) {
|
|
114
|
+
return undefined;
|
|
115
|
+
}
|
|
116
|
+
// ignore case - allow both old (code) and migrated (newCode) names
|
|
117
|
+
const schemaConfig = deviceConfig.schema.find(item => {
|
|
118
|
+
if (!dpCode) {
|
|
119
|
+
return false;
|
|
120
|
+
}
|
|
121
|
+
const target = dpCode.toString().toLowerCase();
|
|
122
|
+
const legacyCode = item.code?.toString().toLowerCase();
|
|
123
|
+
const migratedCode = item.newCode?.toString().toLowerCase();
|
|
124
|
+
return legacyCode === target || migratedCode === target;
|
|
125
|
+
});
|
|
126
|
+
if (!schemaConfig) {
|
|
127
|
+
return undefined;
|
|
128
|
+
}
|
|
129
|
+
return schemaConfig;
|
|
130
|
+
}
|
|
85
131
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
86
132
|
async updateDevices(ownerIDs) {
|
|
87
133
|
return [];
|
|
@@ -97,6 +143,7 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
97
143
|
if (oldDevice) {
|
|
98
144
|
this.devices.splice(this.devices.indexOf(oldDevice), 1);
|
|
99
145
|
}
|
|
146
|
+
this.configDevice(device);
|
|
100
147
|
this.devices.push(device);
|
|
101
148
|
return device;
|
|
102
149
|
}
|
|
@@ -114,14 +161,14 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
114
161
|
}
|
|
115
162
|
async getDeviceSchema(deviceID) {
|
|
116
163
|
// const res = await this.api.get(`/v1.2/iot-03/devices/${deviceID}/specification`);
|
|
117
|
-
const res = await this.api.get(`/v1.
|
|
118
|
-
if (res.success
|
|
164
|
+
const res = await this.api.get(`/v1.1/devices/${deviceID}/specifications`);
|
|
165
|
+
if (!res.success) {
|
|
119
166
|
this.log.warn('Get device specification failed. devId = %s, code = %s, msg = %s', deviceID, res.code, res.msg);
|
|
120
167
|
return [];
|
|
121
168
|
}
|
|
122
169
|
// Combine functions and status together, as it used to be.
|
|
123
170
|
const schemas = new Map();
|
|
124
|
-
for (const { code, type, values } of [...res.result.status, ...res.result.functions]) {
|
|
171
|
+
for (const { code, type, values, dp_id } of [...res.result.status, ...res.result.functions]) {
|
|
125
172
|
if (schemas[code]) {
|
|
126
173
|
continue;
|
|
127
174
|
}
|
|
@@ -140,7 +187,8 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
140
187
|
let property;
|
|
141
188
|
try {
|
|
142
189
|
property = JSON.parse(values);
|
|
143
|
-
schemas[code] = { code, mode, type, property };
|
|
190
|
+
schemas[code] = { code, mode, type, property, dp_id };
|
|
191
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
144
192
|
}
|
|
145
193
|
catch (_error) {
|
|
146
194
|
// ignore infrared remote's invalid schema because it's not used.
|
|
@@ -164,28 +212,48 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
164
212
|
const res = await this.api.get(`/v2.0/infrareds/${infraredID}/remotes/${remoteID}/learning-codes`);
|
|
165
213
|
return res;
|
|
166
214
|
}
|
|
167
|
-
resolveInfraredRemotes(parentDevice, allDevices) {
|
|
168
|
-
const isInfraredRemoteDevice = (parent, target) => {
|
|
215
|
+
async resolveInfraredRemotes(parentDevice, allDevices) {
|
|
216
|
+
const isInfraredRemoteDevice = async (parent, target) => {
|
|
217
|
+
if (!parent.isIRControlHub()) {
|
|
218
|
+
return false;
|
|
219
|
+
}
|
|
169
220
|
if (!target.sub || !target.category.startsWith('infrared_')) {
|
|
170
221
|
return false;
|
|
171
222
|
}
|
|
223
|
+
if (parent.id === target.parent_id) {
|
|
224
|
+
return true;
|
|
225
|
+
}
|
|
172
226
|
if (parent.lat === target.lat && parent.lon === target.lon) {
|
|
173
227
|
return true;
|
|
174
228
|
}
|
|
175
229
|
if (parent.update_time === target.update_time) {
|
|
176
230
|
return true;
|
|
177
231
|
}
|
|
232
|
+
if ((await this.getInfraredDIYKeys(parentDevice.id, target.id)).success) {
|
|
233
|
+
return true;
|
|
234
|
+
}
|
|
235
|
+
if ((await this.getInfraredKeys(parentDevice.id, target.id)).success) {
|
|
236
|
+
return true;
|
|
237
|
+
}
|
|
178
238
|
return false;
|
|
179
239
|
};
|
|
180
|
-
const infraredRemotes =
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
240
|
+
const infraredRemotes = [];
|
|
241
|
+
for (const device of allDevices) {
|
|
242
|
+
if (!await isInfraredRemoteDevice(parentDevice, device)) {
|
|
243
|
+
continue;
|
|
244
|
+
}
|
|
245
|
+
infraredRemotes.push({
|
|
246
|
+
'brand_id': 0,
|
|
247
|
+
'brand_name': '',
|
|
184
248
|
'category_id': 999,
|
|
185
249
|
'remote_id': device.id,
|
|
250
|
+
'remote_index': -1,
|
|
251
|
+
'remote_name': device.name,
|
|
186
252
|
'resolved': true,
|
|
187
|
-
|
|
188
|
-
|
|
253
|
+
'org_category_id': 999,
|
|
254
|
+
});
|
|
255
|
+
}
|
|
256
|
+
this.log.debug(`infraredRemotes founded: ${infraredRemotes.length}`);
|
|
189
257
|
return infraredRemotes;
|
|
190
258
|
}
|
|
191
259
|
fixInfraredDevice(subDevice) {
|
|
@@ -208,39 +276,10 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
208
276
|
this.log.debug(`resolved HAP category ID:${category_id}`);
|
|
209
277
|
return category_id;
|
|
210
278
|
}
|
|
211
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
212
|
-
dump(obj) {
|
|
213
|
-
for (const key in obj) {
|
|
214
|
-
try {
|
|
215
|
-
if ((typeof obj[key]) === 'function') {
|
|
216
|
-
this.log.warn(`\t function ${key}:${obj[key].name}`);
|
|
217
|
-
}
|
|
218
|
-
else {
|
|
219
|
-
this.log.warn(`\t ${key}:${obj[key]}`);
|
|
220
|
-
}
|
|
221
|
-
}
|
|
222
|
-
catch (e) {
|
|
223
|
-
this.dump(e);
|
|
224
|
-
}
|
|
225
|
-
if ((typeof obj[key]) !== 'string') {
|
|
226
|
-
for (const key2 in obj[key]) {
|
|
227
|
-
try {
|
|
228
|
-
if ((typeof obj[key][key2]) === 'function') {
|
|
229
|
-
this.log.warn(`\t function ${key2}:${obj[key][key2].name}`);
|
|
230
|
-
}
|
|
231
|
-
else {
|
|
232
|
-
this.log.warn(`\t ${key2}:${obj[key][key2]}`);
|
|
233
|
-
}
|
|
234
|
-
}
|
|
235
|
-
catch (e) {
|
|
236
|
-
this.dump(e);
|
|
237
|
-
}
|
|
238
|
-
}
|
|
239
|
-
}
|
|
240
|
-
}
|
|
241
|
-
}
|
|
242
279
|
async updateInfraredRemotes(allDevices) {
|
|
243
280
|
const irDevices = allDevices.filter(device => device.isIRControlHub());
|
|
281
|
+
const orphanDevices = allDevices.filter(device => device.sub && !device.parent_id);
|
|
282
|
+
this.log.debug(`irhubs:${JSON.stringify(irDevices.map(d => d.name))}`);
|
|
244
283
|
for (const irDevice of irDevices) {
|
|
245
284
|
const res = await this.getInfraredRemotes(irDevice.id);
|
|
246
285
|
if (!res.success) {
|
|
@@ -248,7 +287,14 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
248
287
|
continue;
|
|
249
288
|
}
|
|
250
289
|
let resResult = res.result;
|
|
251
|
-
|
|
290
|
+
const remoteDeviceIDs = resResult.map(item => item.remote_id);
|
|
291
|
+
for (let i = orphanDevices.length - 1; i >= 0; i--) {
|
|
292
|
+
if (remoteDeviceIDs.includes(orphanDevices[i].id)) {
|
|
293
|
+
orphanDevices.splice(i, 1);
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
const resolvedRemoteDevices = await this.resolveInfraredRemotes(irDevice, orphanDevices);
|
|
297
|
+
for (const resolvedRemoteDevice of resolvedRemoteDevices) {
|
|
252
298
|
resResult.forEach(remoteDevice => {
|
|
253
299
|
if (remoteDevice.remote_id === resolvedRemoteDevice.remote_id) {
|
|
254
300
|
remoteDevice.org_category_id = remoteDevice.category_id;
|
|
@@ -256,13 +302,16 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
256
302
|
remoteDevice.resolved = true;
|
|
257
303
|
}
|
|
258
304
|
});
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
305
|
+
if (!resResult.map(remoteDevice => remoteDevice.remote_id).includes(resolvedRemoteDevice.remote_id)) {
|
|
306
|
+
this.log.success(`infrared remote device found: ${resolvedRemoteDevice.remote_name}`);
|
|
307
|
+
resResult.push(resolvedRemoteDevice);
|
|
308
|
+
for (let i = orphanDevices.length - 1; i >= 0; i--) {
|
|
309
|
+
if (resolvedRemoteDevice.remote_id === orphanDevices[i].id) {
|
|
310
|
+
orphanDevices.splice(i, 1);
|
|
311
|
+
break;
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
}
|
|
266
315
|
}
|
|
267
316
|
for (const { category_id, remote_id, resolved } of resResult) {
|
|
268
317
|
const subDevice = allDevices.find(device => device.id === remote_id);
|
|
@@ -324,6 +373,7 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
324
373
|
}
|
|
325
374
|
}
|
|
326
375
|
}
|
|
376
|
+
// eslint-disable-next-line max-len
|
|
327
377
|
async sendInfraredCommands(infraredID, remoteID, category_id, remote_index, key, key_id) {
|
|
328
378
|
const res = await this.api.post(`/v2.0/infrareds/${infraredID}/remotes/${remoteID}/raw/command`, {
|
|
329
379
|
category_id, remote_index, key, key_id,
|
|
@@ -340,16 +390,16 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
340
390
|
}
|
|
341
391
|
async sendInfraredDIYCommands(infraredID, remoteID, code) {
|
|
342
392
|
const res = await this.api.post(`/v2.0/infrareds/${infraredID}/remotes/${remoteID}/learning-codes`, { code });
|
|
343
|
-
// const res = await this.api.post(`/v1.0/infrareds/${infraredID}/remotes/${remoteID}/learning-codes`, { code });
|
|
344
393
|
return res;
|
|
345
394
|
}
|
|
346
395
|
async getLockTemporaryKey(deviceID) {
|
|
347
396
|
// const res = await this.api.post(`/v1.0/smart-lock/devices/${deviceID}/door-lock/password-ticket`);
|
|
348
397
|
const res = await this.api.post(`/v1.0/smart-lock/devices/${deviceID}/password-ticket`);
|
|
349
|
-
if (res.success
|
|
398
|
+
if (!res.success) {
|
|
350
399
|
this.log.warn('Get Temporary Pass failed. devID = %s, code = %s, msg = %s', deviceID, res.code, res.msg);
|
|
400
|
+
return null;
|
|
351
401
|
}
|
|
352
|
-
return res;
|
|
402
|
+
return res.result;
|
|
353
403
|
}
|
|
354
404
|
async sendLockCommands(deviceID, ticketID, open) {
|
|
355
405
|
const res = await this.api.post(`/v1.0/smart-lock/devices/${deviceID}/password-free/door-operate`, {
|
|
@@ -372,11 +422,11 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
372
422
|
const res = await this.api.get(`/v2.0/iot-03/weather/current?lat=${lat}&lon=${lon}`);
|
|
373
423
|
return res.result;
|
|
374
424
|
}
|
|
375
|
-
async
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
return
|
|
425
|
+
async retrieveDeviceRTSP(deviceID) {
|
|
426
|
+
const data = await this.api.post(`/v1.0/devices/${deviceID}/stream/actions/allocate`, {
|
|
427
|
+
type: 'rtsp',
|
|
428
|
+
});
|
|
429
|
+
return data.result.url;
|
|
380
430
|
}
|
|
381
431
|
async onMQTTMessage(topic, protocol, message) {
|
|
382
432
|
switch (protocol) {
|
|
@@ -393,7 +443,7 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
393
443
|
}
|
|
394
444
|
item.value = _item.value;
|
|
395
445
|
}
|
|
396
|
-
this.emit(Events.DEVICE_STATUS_UPDATE, device, status);
|
|
446
|
+
this.emit(TuyaDeviceManager_1.default.Events.DEVICE_STATUS_UPDATE, device, status);
|
|
397
447
|
break;
|
|
398
448
|
}
|
|
399
449
|
case TuyaMQTTProtocol.DEVICE_INFO_UPDATE: {
|
|
@@ -411,7 +461,7 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
411
461
|
return;
|
|
412
462
|
}
|
|
413
463
|
this.mq.start(); // Force reconnect, unless new device status update won't get received
|
|
414
|
-
this.emit(Events.DEVICE_ADD, device);
|
|
464
|
+
this.emit(TuyaDeviceManager_1.default.Events.DEVICE_ADD, device);
|
|
415
465
|
}
|
|
416
466
|
else if (bizCode === 'nameUpdate') {
|
|
417
467
|
const { name } = bizData;
|
|
@@ -420,7 +470,7 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
420
470
|
return;
|
|
421
471
|
}
|
|
422
472
|
device.name = name;
|
|
423
|
-
this.emit(Events.DEVICE_INFO_UPDATE, device, bizData);
|
|
473
|
+
this.emit(TuyaDeviceManager_1.default.Events.DEVICE_INFO_UPDATE, device, bizData);
|
|
424
474
|
}
|
|
425
475
|
else if (bizCode === 'online' || bizCode === 'offline') {
|
|
426
476
|
const device = this.getDevice(devId);
|
|
@@ -428,7 +478,7 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
428
478
|
return;
|
|
429
479
|
}
|
|
430
480
|
device.online = (bizCode === 'online') ? true : false;
|
|
431
|
-
this.emit(Events.DEVICE_INFO_UPDATE, device, bizData);
|
|
481
|
+
this.emit(TuyaDeviceManager_1.default.Events.DEVICE_INFO_UPDATE, device, bizData);
|
|
432
482
|
}
|
|
433
483
|
else if (bizCode === 'delete') {
|
|
434
484
|
const { ownerId } = bizData;
|
|
@@ -441,7 +491,7 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
441
491
|
return;
|
|
442
492
|
}
|
|
443
493
|
this.devices.splice(this.devices.indexOf(device), 1);
|
|
444
|
-
this.emit(Events.DEVICE_DELETE, devId);
|
|
494
|
+
this.emit(TuyaDeviceManager_1.default.Events.DEVICE_DELETE, devId);
|
|
445
495
|
}
|
|
446
496
|
else if (bizCode === 'event_notify') {
|
|
447
497
|
// doorbell event
|
|
@@ -460,5 +510,5 @@ class TuyaDeviceManager extends events_1.default {
|
|
|
460
510
|
}
|
|
461
511
|
}
|
|
462
512
|
}
|
|
463
|
-
exports.default =
|
|
464
|
-
//# sourceMappingURL=
|
|
513
|
+
exports.default = TuyaCloudDeviceManager;
|
|
514
|
+
//# sourceMappingURL=TuyaCloudDeviceManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TuyaCloudDeviceManager.js","sourceRoot":"","sources":["../../../src/cloud/device/TuyaCloudDeviceManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,15 +3,85 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const TuyaOpenAPI_1 = require("../api/TuyaOpenAPI");
|
|
6
7
|
const TuyaDevice_1 = __importDefault(require("./TuyaDevice"));
|
|
7
|
-
const
|
|
8
|
-
class TuyaCustomDeviceManager extends
|
|
9
|
-
constructor(api, debug = false) {
|
|
10
|
-
super(api, debug);
|
|
8
|
+
const TuyaCloudDeviceManager_1 = __importDefault(require("./TuyaCloudDeviceManager"));
|
|
9
|
+
class TuyaCustomDeviceManager extends TuyaCloudDeviceManager_1.default {
|
|
10
|
+
constructor(api, config, debug = false) {
|
|
11
|
+
super(api, config, debug);
|
|
11
12
|
this.api = api;
|
|
13
|
+
this.config = config;
|
|
12
14
|
this.debug = debug;
|
|
15
|
+
this.DEFAULT_USER = 'homebridge';
|
|
16
|
+
this.DEFAULT_PASS = 'homebridge';
|
|
13
17
|
this.mq.version = '2.0';
|
|
14
18
|
}
|
|
19
|
+
async pullDevices() {
|
|
20
|
+
let res;
|
|
21
|
+
this.log.info('Get token.');
|
|
22
|
+
res = await this.api.getToken();
|
|
23
|
+
if (!res.success) {
|
|
24
|
+
this.log.error(`Get token failed. code=${res.code}, msg=${res.msg}`);
|
|
25
|
+
return [];
|
|
26
|
+
}
|
|
27
|
+
this.log.info(`Search default user "${this.DEFAULT_USER}"`);
|
|
28
|
+
res = await this.api.customGetUserInfo(this.DEFAULT_USER);
|
|
29
|
+
if (!res.success) {
|
|
30
|
+
this.log.error(`Search user failed. code=${res.code}, msg=${res.msg}`);
|
|
31
|
+
return [];
|
|
32
|
+
}
|
|
33
|
+
if (!res.result.user_name) {
|
|
34
|
+
this.log.info(`Default user "${this.DEFAULT_USER}" not exist.`);
|
|
35
|
+
this.log.info(`Creating default user "${this.DEFAULT_USER}".`);
|
|
36
|
+
res = await this.api.customCreateUser(this.DEFAULT_USER, this.DEFAULT_PASS);
|
|
37
|
+
if (!res.success) {
|
|
38
|
+
this.log.error(`Create default user failed. code=${res.code}, msg=${res.msg}`);
|
|
39
|
+
return [];
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
this.log.info(`Default user "${this.DEFAULT_USER}" exists.`);
|
|
44
|
+
}
|
|
45
|
+
const uid = res.result.user_id;
|
|
46
|
+
this.log.info('Fetching asset list.');
|
|
47
|
+
res = await this.getAssetList();
|
|
48
|
+
if (!res.success) {
|
|
49
|
+
this.log.error(`Fetching asset list failed. code=${res.code}, msg=${res.msg}`);
|
|
50
|
+
return [];
|
|
51
|
+
}
|
|
52
|
+
const assetIDList = [];
|
|
53
|
+
for (const { asset_id, asset_name } of res.result.list) {
|
|
54
|
+
this.log.info(`Got asset_id=${asset_id}, asset_name=${asset_name}`);
|
|
55
|
+
assetIDList.push(asset_id);
|
|
56
|
+
}
|
|
57
|
+
if (assetIDList.length === 0) {
|
|
58
|
+
this.log.warn('Asset list is empty. exit.');
|
|
59
|
+
return [];
|
|
60
|
+
}
|
|
61
|
+
this.log.info('Authorize asset list.');
|
|
62
|
+
res = await this.authorizeAssetList(uid, assetIDList, true);
|
|
63
|
+
if (!res.success) {
|
|
64
|
+
this.log.error(`Authorize asset list failed. code=${res.code}, msg=${res.msg}`);
|
|
65
|
+
return [];
|
|
66
|
+
}
|
|
67
|
+
this.log.info(`Log in with user "${this.DEFAULT_USER}".`);
|
|
68
|
+
res = await this.api.customLogin(this.DEFAULT_USER, this.DEFAULT_USER);
|
|
69
|
+
if (!res.success) {
|
|
70
|
+
this.log.error(`Login failed. code=${res.code}, msg=${res.msg}`);
|
|
71
|
+
if (res.code && TuyaOpenAPI_1.LOGIN_ERROR_MESSAGES[res.code]) {
|
|
72
|
+
this.log.error(TuyaOpenAPI_1.LOGIN_ERROR_MESSAGES[res.code]);
|
|
73
|
+
}
|
|
74
|
+
return [];
|
|
75
|
+
}
|
|
76
|
+
this.log.info('Start MQTT connection.');
|
|
77
|
+
this.mq.start();
|
|
78
|
+
this.log.info('Fetching device list.');
|
|
79
|
+
this.ownerIDs = assetIDList;
|
|
80
|
+
const devices = await this.updateDevices(assetIDList);
|
|
81
|
+
this.log.info(`Got ${devices.length} device(s) and scene(s).`);
|
|
82
|
+
await this.updateInfraredRemotes(devices);
|
|
83
|
+
return devices;
|
|
84
|
+
}
|
|
15
85
|
async getAssetList(parent_asset_id = -1) {
|
|
16
86
|
// const res = await this.api.get('/v1.0/iot-03/users/assets', {
|
|
17
87
|
const res = await this.api.get(`/v1.0/iot-02/assets/${parent_asset_id}/sub-assets`, {
|
|
@@ -32,7 +102,6 @@ class TuyaCustomDeviceManager extends TuyaDeviceManager_1.default {
|
|
|
32
102
|
const params = {
|
|
33
103
|
page_size: 50,
|
|
34
104
|
};
|
|
35
|
-
// eslint-disable-next-line no-constant-condition
|
|
36
105
|
while (true) {
|
|
37
106
|
const res = await this.api.get(`/v1.0/iot-02/assets/${assetID}/devices`, params);
|
|
38
107
|
deviceIDs = deviceIDs.concat(res.result.list.map(item => item['device_id']));
|
|
@@ -54,6 +123,7 @@ class TuyaCustomDeviceManager extends TuyaDeviceManager_1.default {
|
|
|
54
123
|
const res = await this.getDeviceListInfo(deviceIDs);
|
|
55
124
|
const devices = res.result.devices.map(obj => new TuyaDevice_1.default(obj));
|
|
56
125
|
for (const device of devices) {
|
|
126
|
+
this.configDevice(device);
|
|
57
127
|
device.schema = await this.getDeviceSchema(device.id);
|
|
58
128
|
}
|
|
59
129
|
// this.log.debug('Devices updated.\n', JSON.stringify(devices, null, 2));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TuyaCustomDeviceManager.js","sourceRoot":"","sources":["../../../src/cloud/device/TuyaCustomDeviceManager.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"TuyaCustomDeviceManager.js","sourceRoot":"","sources":["../../../src/cloud/device/TuyaCustomDeviceManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TuyaDevice.js","sourceRoot":"","sources":["../../../src/cloud/device/TuyaDevice.ts"],"names":[],"mappings":";;;AACA,IAAY,oBAKX;AALD,WAAY,oBAAoB;IAC9B,oCAAY,CAAA;IACZ,yCAAiB,CAAA;IACjB,wCAAgB,CAAA;IAChB,yCAAiB,CAAA;AACnB,CAAC,EALW,oBAAoB,oCAApB,oBAAoB,QAK/B;AAED,IAAY,oBAOX;AAPD,WAAY,oBAAoB;IAC9B,2CAAmB,CAAA;IACnB,2CAAmB,CAAA;IACnB,qCAAa,CAAA;IACb,yCAAiB,CAAA;IACjB,qCAAa,CAAA;IACb,mCAAW,CAAA;AACb,CAAC,EAPW,oBAAoB,oCAApB,oBAAoB,QAO/B;
|
|
1
|
+
{"version":3,"file":"TuyaDevice.js","sourceRoot":"","sources":["../../../src/cloud/device/TuyaDevice.ts"],"names":[],"mappings":";;;AACA,IAAY,oBAKX;AALD,WAAY,oBAAoB;IAC9B,oCAAY,CAAA;IACZ,yCAAiB,CAAA;IACjB,wCAAgB,CAAA;IAChB,yCAAiB,CAAA;AACnB,CAAC,EALW,oBAAoB,oCAApB,oBAAoB,QAK/B;AAED,IAAY,oBAOX;AAPD,WAAY,oBAAoB;IAC9B,2CAAmB,CAAA;IACnB,2CAAmB,CAAA;IACnB,qCAAa,CAAA;IACb,yCAAiB,CAAA;IACjB,qCAAa,CAAA;IACb,mCAAW,CAAA;AACb,CAAC,EAPW,oBAAoB,oCAApB,oBAAoB,QAO/B;AAmFD,MAAqB,UAAU;IAqC7B,YAAY,GAAwB;QAClC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACzB,kEAAkE;QAClE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACnB,CAAC;QACD,kEAAkE;QAClE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACnB,CAAC;IACH,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC;aAClC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IACjF,CAAC;CAEF;AAlED,6BAkEC"}
|