SH/PHP_SMART_HOME_V3
SH/PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Google Home API Improvement + Refactoring

Browse Source
This commit is contained in:
JonatanRek 2020-06-26 16:57:26 +02:00
parent b0650e7fbe
commit 348f8ab57d
3 changed files with 350 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/api/GoogleHomeApi.php
View File

@ -16,12 +16,15 @@ class GoogleHomeApi{
case 'action.devices.QUERY': case 'action.devices.QUERY':
GoogleHome::query($obj['requestId'], $obj['inputs'][0]['payload']); GoogleHome::query($obj['requestId'], $obj['inputs'][0]['payload']);
//$apiLogManager->write("[Google Home] action.devices.QUERY", LogRecordType::INFO); $apiLogManager->write("[Google Home] action.devices.QUERY", LogRecordType::INFO);
$apiLogManager->write("[API] request body\n" . json_encode($obj, JSON_PRETTY_PRINT), LogRecordType::INFO);
break; break;
case 'action.devices.EXECUTE': case 'action.devices.EXECUTE':
GoogleHome::execute($obj['requestId'], $obj['inputs'][0]['payload']); GoogleHome::execute($obj['requestId'], $obj['inputs'][0]['payload']);
$apiLogManager->write("[Google Home] action.devices.EXECUTE", LogRecordType::INFO); $apiLogManager->write("[Google Home] action.devices.EXECUTE", LogRecordType::INFO);
$apiLogManager->write("[API] request body\n" . json_encode($obj, JSON_PRETTY_PRINT), LogRecordType::INFO);
break; break;
} }
} }

146
app/models/GoogleHome.php
View File

@ -6,40 +6,54 @@ class GoogleHome {
foreach ($roomsData as $roomKey => $roomData) { foreach ($roomsData as $roomKey => $roomData) {
$devicesData = DeviceManager::getAllDevicesInRoom($roomData['room_id']); $devicesData = DeviceManager::getAllDevicesInRoom($roomData['room_id']);
foreach ($devicesData as $deviceKey => $deviceData) { foreach ($devicesData as $deviceKey => $deviceData) {
$subDevicesData = SubDeviceManager::getAllSubDevices($deviceData['device_id']); $traids = [];
foreach ($subDevicesData as $subDeviceKey => $subDeviceData) { $attributes = null;
if ($subDeviceData['type'] != "on/off" && $subDeviceData['type'] != "temp_cont") continue;
//Google Compatibile Action Type //Google Compatibile Action Type
$actionType = GoogleHomeDeviceTypes::getAction($subDeviceData['type']); $actionType = GoogleHomeDeviceTypes::getAction($deviceData['type']);
if ($actionType == "") continue;
if (strpos($deviceData['name'], 'Světlo') !== false || strpos($deviceData['name'], 'světlo') !== false) { $subDevicesData = SubDeviceManager::getAllSubDevices($deviceData['device_id']);
$actionType = 'action.devices.types.LIGHT'; foreach ($subDevicesData as $subDeviceKey => $subDeviceData) {
$deviceTraid = GoogleHomeDeviceTypes::getTraid($subDeviceData['type']);
if ($deviceTraid != "") {
$traids[] = $deviceTraid;
}
$deviceAttributes = GoogleHomeDeviceTypes::getAttribute($subDeviceData['type']);
if ($deviceAttributes != "") {
$attributes = $deviceAttributes;
}
} }
$tempDevice = [ $tempDevice = [
'id' => (string) $subDeviceData['subdevice_id'], 'id' => (string) $deviceData['device_id'],
'type' => $actionType, 'type' => $actionType,
'traits' => $traids,
'attributes' => $attributes,
'name' => [ 'name' => [
'name' => $deviceData['name'], 'name' => $deviceData['name'],
], ],
'willReportState' => false, 'willReportState' => false,
'roomHint' => $roomData['name'] 'roomHint' => $roomData['name']
]; ];
if ($tempDevice['attributes'] == null) unset($tempDevice['attributes']);
//traids & Attributes //traids & Attributes
$devices[] = GoogleHomeDeviceTypes::getSyncObj($tempDevice, $actionType); $devices[] = $tempDevice;
}
} }
} }
$response = [ $response = [
'requestId' => $requestId, 'requestId' => $requestId,
'payload' => [ 'payload' => [
'agentUserId'=>'651351531531', 'agentUserId'=>'651351531531',
'devices' => $devices, 'devices' => array_values( $devices ),
], ],
]; ];
$apiLogManager = new LogManager('../logs/google-home/'. date("Y-m-d").'.log'); $apiLogManager = new LogManager('../logs/google-home/'. date("Y-m-d").'.log');
$apiLogManager->write("[API][$requestId] request response\n" . json_encode($response, JSON_PRETTY_PRINT), LogRecordType::INFO); $apiLogManager->write("[API][$requestId] request response\n" . json_encode($response, JSON_PRETTY_PRINT), LogRecordType::INFO);
echo json_encode($response); echo json_encode($response);
@ -48,18 +62,53 @@ class GoogleHome {
static function query($requestId, $payload){ static function query($requestId, $payload){
$devices = []; $devices = [];
foreach ($payload['devices'] as $deviceId) { foreach ($payload['devices'] as $deviceId) {
$subDeviceData = SubDeviceManager::getSubDevice($deviceId['id']); $subDevicesData = SubDeviceManager::getAllSubDevices($deviceId['id']);
if ($subDeviceData['type'] != "on/off" && $subDeviceData['type'] != "temp_cont") continue;
$state = false; $tempDevice = [
if (RecordManager::getLastRecord($deviceId['id'])['value'] == 1){ $deviceId['id'] => [
$state = true; 'online' => false,
'status'=> 'OFFLINE',
]
];
foreach ($subDevicesData as $key => $subDeviceData) {
$lastRecord = RecordManager::getLastRecord($subDeviceData['subdevice_id']);
if ($lastRecord['execuded'] == 1){
$tempDevice[$deviceId['id']]['online'] = true;
$tempDevice[$deviceId['id']]['status'] = 'SUCCESS';
} else {
$executed = 0;
$waiting = 0;
foreach (RecordManager::getLastRecord($deviceId['id'], 6) as $key => $value) {
if ($value['execuded'] == 1){
$executed++;
} else {
$waiting++;
}
}
if ($waiting < $executed){
$tempDevice[$deviceId['id']]['online'] = true;
}
} }
$online = false; switch ($subDeviceData['type']) {
$status = 'OFFLINE'; case 'temp_cont':
$tempDevice[$deviceId['id']]['thermostatMode'] = 'off';
if ($lastRecord['value'] != 0) {
$tempDevice[$deviceId['id']]['thermostatMode'] = 'heat';
}
$tempDevice[$deviceId['id']]['thermostatTemperatureAmbient'] = $lastRecord['value'];
$tempDevice[$deviceId['id']]['thermostatTemperatureSetpoint'] = $lastRecord['value'];
break;
default:
$tempDevice[$deviceId['id']]['on'] = ($lastRecord['value'] == 1 ? true : false);
break;
}
}
if (RecordManager::getLastRecord($deviceId['id'])['execuded'] == 1){
if ($lastRecord['execuded'] == 1){
$online = true; $online = true;
$status = 'SUCCESS'; $status = 'SUCCESS';
} else { } else {
@ -74,34 +123,15 @@ class GoogleHome {
} }
if ($waiting < $executed){ if ($waiting < $executed){
$status = "PENDING"; $status = "PENDING";
$online = true; $online = true;
} }
} }
$tempDevice = [
$deviceId['id'] => [
'online' => $online,
'status'=> $status,
]
];
if ($subDeviceData['type'] == "temp_cont"){
$tempDevice[$deviceId['id']]['thermostatMode'] = 'off';
if (RecordManager::getLastRecord($deviceId['id'])['value'] != 0) {
$tempDevice[$deviceId['id']]['thermostatMode'] = 'heat';
}
$tempDevice[$deviceId['id']]['thermostatTemperatureAmbient'] = RecordManager::getLastRecord($deviceId['id'])['value'];
$tempDevice[$deviceId['id']]['thermostatTemperatureSetpoint'] = RecordManager::getLastRecord($deviceId['id'])['value'];
} else {
$tempDevice[$deviceId['id']]['on'] = $state;
}
$devices = $tempDevice; $devices = $tempDevice;
if (count($devices)> 1){ if (count($devices)> 1){
$devices[] = $tempDevice; $devices[] = $tempDevice;
} }
} }
$response = [ $response = [
'requestId' => $requestId, 'requestId' => $requestId,
'payload' => [ 'payload' => [
@ -124,7 +154,8 @@ class GoogleHome {
$executionCommand = $command['execution'][$key]; $executionCommand = $command['execution'][$key];
} }
$subDeviceId = $device['id']; $deviceType = GoogleHomeDeviceTypes::getType($executionCommand['command']);
$subDeviceId = SubDeviceManager::getSubDeviceByMasterAndType($device['id'], $deviceType)['subdevice_id'];
switch ($executionCommand['command']) { switch ($executionCommand['command']) {
case 'action.devices.commands.OnOff': case 'action.devices.commands.OnOff':
@ -138,6 +169,11 @@ class GoogleHome {
case 'action.devices.commands.ThermostatSetMode': case 'action.devices.commands.ThermostatSetMode':
$commands[] = self::executeTermostatMode($subDeviceId, $executionCommand); $commands[] = self::executeTermostatMode($subDeviceId, $executionCommand);
break; break;
case 'action.devices.commands.setVolume':
$commands[] = self::executeVolume($subDeviceId, $executionCommand);
break;
} }
} }
} }
@ -148,6 +184,7 @@ class GoogleHome {
'commands' => $commands, 'commands' => $commands,
], ],
]; ];
$apiLogManager = new LogManager('../logs/google-home/'. date("Y-m-d").'.log'); $apiLogManager = new LogManager('../logs/google-home/'. date("Y-m-d").'.log');
$apiLogManager->write("[API][EXECUTE][$requestId]\n" . json_encode($response, JSON_PRETTY_PRINT), LogRecordType::INFO); $apiLogManager->write("[API][EXECUTE][$requestId]\n" . json_encode($response, JSON_PRETTY_PRINT), LogRecordType::INFO);
@ -260,4 +297,37 @@ class GoogleHome {
return $commandTemp; return $commandTemp;
} }
static function executeVolume($subDeviceId, $executionCommand){
$status = "SUCCESS";
$currentVolume = RecordManager::getLastRecord($subDeviceId)['value'];
if (isset($executionCommand['params']['volumeLevel'])) {
RecordManager::createWithSubId($subDeviceId, $executionCommand['params']['volumeLevel']);
$executed = 0;
$waiting = 0;
foreach (RecordManager::getLastRecord($subDeviceId, 4) as $key => $value) {
if ($value['execuded'] == 1){
$executed++;
} else {
$waiting++;
}
}
if ($waiting < $executed){
$status = "PENDING";
} else {
$currentVolume = $executionCommand['params']['volumeLevel'];
}
}
$commandTemp = [
'ids' => [$subDeviceId],
'status' => $status,
'states' => [
'currentVolume' => $currentVolume,
],
];
return $commandTemp;
}
} }

91
app/models/types/GoogleHomeDeviceTypes.php
View File

@ -72,35 +72,86 @@ class GoogleHomeDeviceTypes {
const YogurtMaker = 'action.devices.types.YOGURTMAKER';*/ const YogurtMaker = 'action.devices.types.YOGURTMAKER';*/
private static $actionWordBook = [ private static $actionWordBook = [
'on/off' => 'action.devices.types.OUTLET', 'control-light' => 'action.devices.types.OUTLET',
'temp_cont' => 'action.devices.types.THERMOSTAT', 'control-socket' => 'action.devices.types.OUTLET',
'control-temp' => 'action.devices.types.THERMOSTAT',
'control-media' => 'action.devices.types.REMOTECONTROL',
];
private static $traidWordBook = [
'on/off' => 'action.devices.traits.OnOff',
'temp_cont' => 'action.devices.traits.TemperatureSetting',
'vol_cont' => 'action.devices.traits.Volume',
];
private static $commandWordBook = [
'action.devices.commands.OnOff' => 'on/off',
'action.devices.commands.ThermostatTemperatureSetpoint' => 'temp_cont',
'action.devices.commands.ThermostatSetMode' => 'temp_cont',
'action.devices.commands.setVolume' => 'vol_cont',
];
private static $attributeWordBook = [
'temp_cont' => [
'availableThermostatModes' => 'off,heat',
'thermostatTemperatureUnit' => 'C'
],
'vol_cont' => [
'volumeCanMuteAndUnmute' => false,
'volumeDefaultPercentage' => 6,
'volumeMaxLevel' => 100,
'levelStepSize' => 2,
'commandOnlyVolume' => false,
],
]; ];
static function getAction($deviceType){ static function getAction($deviceType){
if (!isset(self::$actionWordBook[$deviceType])) return;
return self::$actionWordBook[$deviceType]; return self::$actionWordBook[$deviceType];
} }
static function getSyncObj($deviceBaseObj, $deviceType){ static function getTraid($subDeviceType){
switch ($deviceType) { if (!isset(self::$traidWordBook[$subDeviceType])) return;
case 'action.devices.types.LIGHT': return self::$traidWordBook[$subDeviceType];
case 'action.devices.types.OUTLET':
$deviceBaseObj['traits'] = [
'action.devices.traits.OnOff'
];
break;
case 'action.devices.types.THERMOSTAT':
$deviceBaseObj['traits'] = [
'action.devices.traits.TemperatureSetting',
];
$deviceBaseObj['attributes'] = [
"availableThermostatModes" => "off,heat",
"thermostatTemperatureUnit" => "C",
];
break;
} }
return $deviceBaseObj;
static function getType($subDeviceCommand){
if (!isset(self::$commandWordBook[$subDeviceCommand])) return;
return self::$commandWordBook[$subDeviceCommand];
} }
static function getAttribute($subDeviceType){
if (!isset(self::$attributeWordBook[$subDeviceType])) return;
return self::$attributeWordBook[$subDeviceType];
}
// static function getSyncObj($deviceBaseObj, $deviceType){
// switch ($deviceType) {
// case 'action.devices.types.LIGHT':
// case 'action.devices.types.OUTLET':
// $deviceBaseObj['traits'] = [
// 'action.devices.traits.OnOff'
// ];
// break;
// case 'action.devices.types.THERMOSTAT':
// $deviceBaseObj['traits'] = [
// 'action.devices.traits.TemperatureSetting',
// ];
// $deviceBaseObj['attributes'] = [
// "availableThermostatModes" => "off,heat",
// "thermostatTemperatureUnit" => "C",
// ];
// break;
// case 'action.devices.types.REMOTECONTROL':
// $deviceBaseObj['traits'] = [
// 'action.devices.traits.Volume',
// 'action.devices.traits.MediaState',
// 'action.devices.traits.OnOff',
// ];
// break;
// }
// return $deviceBaseObj;
// }
static function getQueryJson($deviceType, $type){ static function getQueryJson($deviceType, $type){
return self::$wordBook[$type]; return self::$wordBook[$type];
} }