Google Home Bether Working

app/Bootstrap.php

@@ -42,10 +42,22 @@ class ErrorHandler {
 			'message' => $exception->getMessage(),
 		];
 		echo json_encode($message);
+
+		$apiLogManager = new LogManager('../logs/'. date("Y-m-d").'.log');
+		$apiLogManager->write("[APACHE] ERROR\n" . json_encode($message, JSON_PRETTY_PRINT), LogRecordType::INFO);
 	}
 }
 set_exception_handler("ErrorHandler::exception");
 
+$json = file_get_contents('php://input');
+$obj = json_decode($json, true);
+
+$apiLogManager = new LogManager('../logs/api/HA/'. date("Y-m-d").'.log');
+
+$apiLogManager->write("[API] request body\n" . json_encode($obj, JSON_PRETTY_PRINT), LogRecordType::INFO);
+$apiLogManager->write("[API] POST  body\n" . json_encode($_POST, JSON_PRETTY_PRINT), LogRecordType::INFO);
+$apiLogManager->write("[API] GET body\n" . json_encode($_GET, JSON_PRETTY_PRINT), LogRecordType::INFO);
+
 //Debug
 error_reporting(E_ALL);
 ini_set( 'display_errors','1');

app/Routes.php

@@ -22,7 +22,7 @@ $router->post('/api/devices', 'DevicesApi@getAllDevices');
 $router->post('/api/login', 'AuthApi@login');
 
 $router->get('/api/HA/auth', 'GoogleHomeApi@autorize');
-$router->post('/api/HA', 'GoogleHomeApi@response');
+$router->any('/api/HA', 'GoogleHomeApi@response');
 
 // examples
 $router->any('/api/example', 'ExampleApi@example');

app/api/GoogleHomeApi.php

@@ -1,24 +1,19 @@
 <?php
 class GoogleHomeApi {
-	function response()
+	public static function response()
 	{
+		set_time_limit (5);
 		$json = file_get_contents('php://input');
 		$obj = json_decode($json, true);
-
-		$apiLogManager = new LogManager('../logs/api/HA/'. date("Y-m-d").'.log');
-
-		$apiLogManager->write("[API] request body\n" . json_encode($obj, JSON_PRETTY_PRINT), LogRecordType::INFO);
-		$apiLogManager->write("[API] POST  body\n" . json_encode($_POST, JSON_PRETTY_PRINT), LogRecordType::INFO);
-		$apiLogManager->write("[API] GET body\n" . json_encode($_GET, JSON_PRETTY_PRINT), LogRecordType::INFO);
-
 		header('Content-Type: application/json');
+
 		switch ($obj['inputs'][0]['intent']) {
 			case 'action.devices.SYNC':
 			self::sync($obj['requestId']);
 			break;
 
 			case 'action.devices.QUERY':
-
+			self::query($obj['requestId'], $obj['inputs'][0]['payload']);
 			break;
 
 			case 'action.devices.EXECUTE':
@@ -27,6 +22,43 @@ class GoogleHomeApi {
 		}
 	}
 
+	static function query($requestId, $payload){
+
+		foreach ($payload['devices'] as $deviceId) {
+			$subDeviceData = SubDeviceManager::getSubDevice($deviceId['id']);
+			if ($subDeviceData['type'] != "on/off") continue;
+
+			$state = false;
+			if (RecordManager::getLastRecord($deviceId['id'])['value'] == 1){
+				$state = true;
+			}
+
+			$online = false;
+			if (RecordManager::getLastRecord($deviceId['id'])['execuded'] == 1){
+				$online = true;
+			}
+
+			$devices[] = [
+				$deviceId['id'] => [
+					'on' => $state,
+					'online' => $online,
+					'status'=> 'SUCCESS',
+				]
+			];
+		}
+
+
+		$response = [
+			'requestId' => $requestId,
+			'payload' => [
+				'devices' => $devices,
+			],
+		];
+
+		$apiLogManager = new LogManager('../logs/api/HA/'. date("Y-m-d").'.log');
+		$apiLogManager->write("[API] request response\n" . json_encode($response, JSON_PRETTY_PRINT), LogRecordType::INFO);
+		echo json_encode($response);
+	}
 	static function sync($requestId){
 		$devices = [];
 
@@ -53,49 +85,67 @@ class GoogleHomeApi {
 		$response = [
 			'requestId' => $requestId,
 			'payload' => [
-				'agentUserId'=>'simple-Home',
+				'agentUserId'=>'651351531531',
-				'devices' => $devices,],
+				'devices' => $devices,
+			],
 		];
-
 		$apiLogManager = new LogManager('../logs/api/HA/'. date("Y-m-d").'.log');
-
 		$apiLogManager->write("[API] request response\n" . json_encode($response, JSON_PRETTY_PRINT), LogRecordType::INFO);
 		echo json_encode($response);
 	}
 
-	static function execute($subdeviceId, $payload){
+	static function execute($requestId, $payload){
-		$commands = [
+		$commands = [];
-			'ids' => 
+
-		];
 		foreach ($payload['commands'] as $key => $command) {
 			foreach ($command['devices'] as $key => $device) {
+				$executionCommand = $command['execution'][0];
+				if (isset($command['execution'][$key])) {
 					$executionCommand = $command['execution'][$key];
+				}
+
 				$subDeviceId = $device['id'];
 
-				switch ($executionCommand) {
+				switch ($executionCommand['command']) {
 					case 'action.devices.commands.OnOff':
-						if ($executionCommand['on'] == true){
+					$value = 0;
-							//turn ddeivce on
+					if ($executionCommand['params']['on']) $value = 1;
 
-						}
+					RecordManager::createWithSubId($subDeviceId, $value);
-						break;
+
-					default:
+					$timeout = 0;
-						# code...
+					while(RecordManager::getLastRecord($subDeviceId)['execuded'] == 0 && $timeout < 5 ){
-						break;
+						sleep(1);
+						$timeout++;
 					}
 
+					$commandTemp = [
+						'ids' => [$subDeviceId],
+						'status' => 'SUCCESS',
+						'states' => [
+							'on' => $executionCommand['params']['on'],
+						],
+					];
+
+					if ($timeout >= 5){
+						$commandTemp['status'] = "ERROR";
+					}
+					$commands[] = $commandTemp;
+
+					break;
+				}
 			}
 		}
 
 		$response = [
 			'requestId' => $requestId,
 			'payload' => [
-				'commands' => $commands,],
+				'commands' => $commands,
+			],
 		];
-
 		$apiLogManager = new LogManager('../logs/api/HA/'. date("Y-m-d").'.log');
-
 		$apiLogManager->write("[API] request response\n" . json_encode($response, JSON_PRETTY_PRINT), LogRecordType::INFO);
+
 		echo json_encode($response);
 	}
 
@@ -127,5 +177,5 @@ class GoogleHomeApi {
 
 	echo $_GET["redirect_uri"] . '#' . http_build_query($get) ;
 	echo '<a href="'.$_GET["redirect_uri"] . '#' . http_build_query($get) . '">FINISH</a>';
-	}
+}
 }

app/models/LogManager.php

@@ -46,9 +46,6 @@ class LogManager
 
 	function write($value, $type = LogRecordType::ERROR){
 		$record = "[".date("H:m:s")."][".$type."]" . $value . "\n";
-		if (strlen($record) > 65 ) {
-			$record = Utilities::stringInsert($record,"\n",65);
-		}
 		fwrite($this->logFile, $record);
 	}
 

app/models/RecordManager.php

@@ -2,6 +2,19 @@
 class RecordManager{
 	public static $records;
 
+	public static function createWithSubId ($subDeviceId,  $value) {
+		$record = array (
+			'subdevice_id' => $subDeviceId,
+			'value' => $value,
+		);
+		try {
+			return Db::add ('records', $record);
+		} catch(PDOException $error) {
+			echo $error->getMessage();
+			die();
+		}
+	}
+
 	public static function create ($deviceId, $type, $value) {
 		$subDeviceId = Db::loadOne('SELECT * FROM subdevices WHERE device_id = ? AND type = ?;', array($deviceId, $type))['subdevice_id'];
 		if ($subDeviceId == '') {
@@ -19,6 +32,7 @@ class RecordManager{
 		}
 	}
 
+
 	public static function setExecuted($recordId) {
 		try {
 			Db::edit ('records', ['execuded' => 1], 'WHERE record_id = ?', array($recordId));