Pugins Fixes + Dame Jídlo Fix

README.md

@@ -136,6 +136,17 @@ Distributed under the MIT License. See `LICENSE` for more information.
 Project Link: [https://github.com/GamerClassN7/Smart_Home/](https://github.com/GamerClassN7/Smart_Home/) <br> <br>
 <sup><sub>Tags (ignore): ESP32 ESP12 ESP08 ESP01 ESP Smart Home Automation System PWA PHP HTML JS DHT11 DHT22
 
+## Code Statistics
+Type | Files | Lines
+-----|-------|-----------
+php  | 2     | 2298 (89%)
+md   | 1     | 171 (7%)
+js   | 1     | 64 (2%)
+sh   | 1     | 34 (1%)
+json | 1     | 10 (0.4%)
+-----|-------|-----------
+All  | 6     | 2577
+
 ## Folder structure
 ```
 - /app								# app specific files

app/api/EndpointsApi.php

@@ -113,7 +113,7 @@ class EndpointsApi extends ApiController{
 				}
 
 				$subDeviceLastReordValue[$key] = $value['value'];
-				RecordManager::create($device['device_id'], $key, round($value['value'],3));
+				RecordManager::create($device['device_id'], $key, round($value['value'],3), 'device');
 				$logManager->write("[API] Device_ID " . $device['device_id'] . " writed value " . $key . ' ' . $value['value'], LogRecordTypes::INFO);
 
 				//notification

app/api/WidgetApi.php

@@ -14,7 +14,7 @@ class WidgetApi extends ApiController
 		$subDeviceData = SubDeviceManager::getSubDevice($subDeviceId);
 		if ($subDeviceData['type'] == 'on/off') {
 			$lastValue = RecordManager::getLastRecord($subDeviceData['subdevice_id'])['value'];
-			RecordManager::create($subDeviceData['device_id'], 'on/off', (int) !$lastValue);
+			RecordManager::create($subDeviceData['device_id'], 'on/off', (int) !$lastValue, "vue-app");
 			$response = !$lastValue;
 		} else {
 			throw new Exception("Bad Request", 403);

app/models/GoogleHome.php

@@ -1,6 +1,8 @@
 <?php
-class GoogleHome {
+class GoogleHome
-	static function sync($requestId){
+{
+	static function sync($requestId)
+	{
 		$devices = [];
 		$roomsData = RoomManager::getAllRooms();
 		foreach ($roomsData as $roomKey => $roomData) {
@@ -26,7 +28,7 @@ class GoogleHome {
 					}
 				}
 
-				if ($traids < 1){
+				if ($traids < 1) {
 					continue;
 				}
 
@@ -53,43 +55,45 @@ class GoogleHome {
 		$response = [
 			'requestId' => $requestId,
 			'payload' => [
-				'agentUserId'=>'651351531531',
+				'agentUserId' => '651351531531',
-				'devices' => array_values( $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->setLevel(LOGLEVEL);
 		$apiLogManager->write("[API][$requestId] request response\n" . json_encode($response, JSON_PRETTY_PRINT), LogRecordTypes::INFO);
 		echo json_encode($response);
 	}
 
-	static function query($requestId, $payload){
+	static function query($requestId, $payload)
+	{
 		$devices = [];
 		$num = 0;
 		foreach ($payload['devices'] as $deviceId) {
-			$subDevicesData = SubDeviceManager::getAllSubDevices($deviceId['id']);
 
 			$tempDevice[$deviceId['id']] = [
 				'online' => false,
 				'status' => 'OFFLINE',
 			];
+
+			if ($subDevicesData = SubDeviceManager::getAllSubDevices($deviceId['id'])) {
 				foreach ($subDevicesData as $key => $subDeviceData) {
 					$lastRecord = RecordManager::getLastRecord($subDeviceData['subdevice_id']);
-				if ($lastRecord['execuded'] == 1){
+					if ($lastRecord != false && $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){
+							if ($value['execuded'] == 1) {
 								$executed++;
 							} else {
 								$waiting++;
 							}
 						}
-					if ($waiting < $executed){
+						if ($waiting < $executed) {
 							$tempDevice[$deviceId['id']]['online'] = true;
 						}
 					}
@@ -121,29 +125,33 @@ class GoogleHome {
 							break;
 					}
 				}
+			}
 
-		if ($lastRecord['execuded'] == 1){
+			// $lastRecord = RecordManager::getLastRecord($deviceId['id']);
-			$online = true;
+			// //var_dump($lastRecord);
-			$status = 'SUCCESS';
+			// if ($lastRecord['execuded'] == 1) {
-		} else {
+			//  	$online = true;
+			//  	$status = 'SUCCESS';
+			// } else {
 				$executed = 0;
 				$waiting = 0;
 				foreach (RecordManager::getLastRecord($deviceId['id'], 6) as $key => $value) {
-				if ($value['execuded'] == 1){
+					if ($value['execuded'] == 1) {
 						$executed++;
 					} else {
 						$waiting++;
 					}
 				}
-			if ($waiting < $executed){
+
+				if ($waiting < $executed) {
 					$status = "PENDING";
 					$online = true;
 				}
-		}
+			// }
 			$devices = $tempDevice;
-		/*if (count($devices)> 1){
+			if (count($devices)> 1){
 				$devices[] = $tempDevice;
-		}*/
+			}
 		}
 		$response = [
 			'requestId' => $requestId,
@@ -151,13 +159,14 @@ class GoogleHome {
 				'devices' => $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), LogRecordTypes::INFO);
 		$apiLogManager->setLevel(LOGLEVEL);
 		echo json_encode($response);
-}
+	}
 
-static function execute($requestId, $payload){
+	static function execute($requestId, $payload)
+	{
 		$commands = [];
 		foreach ($payload['commands'] as $key => $command) {
 			foreach ($command['devices'] as $key2 => $device) {
@@ -167,7 +176,8 @@ static function execute($requestId, $payload){
 				}
 
 				$deviceType = GoogleHomeDeviceTypes::getType($executionCommand['command']);
-			$subDeviceId = SubDeviceManager::getSubDeviceByMasterAndType($device['id'], $deviceType)['subdevice_id'];
+				if ($subDeviceId = SubDeviceManager::getSubDeviceByMasterAndType($device['id'], $deviceType)) {
+					$subDeviceId = $subDeviceId['subdevice_id'];
 					switch ($executionCommand['command']) {
 						case 'action.devices.commands.OnOff':
 							$commands[] = self::executeSwitch($subDeviceId, $executionCommand);
@@ -212,9 +222,10 @@ static function execute($requestId, $payload){
 						case 'action.devices.commands.mediaStop':
 							$commands[] = self::executeMediaCont($subDeviceId, $executionCommand);
 							break;
-
 					}
 				}
+
+			}
 		}
 		$response = [
 			'requestId' => $requestId,
@@ -223,33 +234,34 @@ static function execute($requestId, $payload){
 			],
 		];
 
-	$apiLogManager = new LogManager('../logs/google-home/'. date("Y-m-d").'.log');
+		$apiLogManager = new LogManager('../logs/google-home/' . date("Y-m-d") . '.log');
 		$apiLogManager->setLevel(LOGLEVEL);
 		$apiLogManager->write("[API][EXECUTE][$requestId]\n" . json_encode($response, JSON_PRETTY_PRINT), LogRecordTypes::INFO);
 
 		echo json_encode($response);
-}
+	}
 
-static function executeSwitch($subDeviceId, $executionCommand){
+	static function executeSwitch($subDeviceId, $executionCommand)
+	{
 		$value = 0;
 		$status = 'OFFLINE';
 		$online = false;
 
 		if ($executionCommand['params']['on']) $value = 1;
 
-	RecordManager::createWithSubId($subDeviceId, $value);
+		RecordManager::createWithSubId($subDeviceId, $value, 'google');
 
 		$executed = 0;
 		$waiting = 0;
 		foreach (RecordManager::getLastRecord($subDeviceId, 4) as $key => $value) {
-		if ($value['execuded'] == 1){
+			if ($value['execuded'] == 1) {
 				$executed++;
 			} else {
 				$waiting++;
 			}
 		}
 
-	if ($waiting < $executed){
+		if ($waiting < $executed) {
 			$status = "PENDING";
 			$online = true;
 		}
@@ -264,9 +276,10 @@ static function executeSwitch($subDeviceId, $executionCommand){
 			],
 		];
 		return $commandTemp;
-}
+	}
 
-static function executeTermostatValue($subDeviceId, $executionCommand){
+	static function executeTermostatValue($subDeviceId, $executionCommand)
+	{
 		$value = 0;
 		$status = 'OFFLINE';
 		$online = false;
@@ -275,19 +288,19 @@ static function executeTermostatValue($subDeviceId, $executionCommand){
 			$value = $executionCommand['params']['thermostatTemperatureSetpoint'];
 		}
 
-	RecordManager::createWithSubId($subDeviceId, $value);
+		RecordManager::createWithSubId($subDeviceId, $value, 'google');
 
 		$executed = 0;
 		$waiting = 0;
 		foreach (RecordManager::getLastRecord($subDeviceId, 4) as $key => $lastValue) {
-		if ($lastValue['execuded'] == 1){
+			if ($lastValue['execuded'] == 1) {
 				$executed++;
 			} else {
 				$waiting++;
 			}
 		}
 
-	if ($waiting < $executed){
+		if ($waiting < $executed) {
 			$status = "PENDING";
 			$online = true;;
 		}
@@ -305,9 +318,10 @@ static function executeTermostatValue($subDeviceId, $executionCommand){
 			],
 		];
 		return $commandTemp;
-}
+	}
 
-static function executeTermostatMode($subDeviceId, $executionCommand){
+	static function executeTermostatMode($subDeviceId, $executionCommand)
+	{
 		$mode = "off";
 		$value = 0;
 		$status = 'OFFLINE';
@@ -318,19 +332,19 @@ static function executeTermostatMode($subDeviceId, $executionCommand){
 			$value = RecordManager::getLastRecordNotNull($subDeviceId)['value'];
 		}
 
-	RecordManager::createWithSubId($subDeviceId, $value);
+		RecordManager::createWithSubId($subDeviceId, $value, 'google');
 
 		$executed = 0;
 		$waiting = 0;
 		foreach (RecordManager::getLastRecord($subDeviceId, 4) as $key => $value) {
-		if ($value['execuded'] == 1){
+			if ($value['execuded'] == 1) {
 				$executed++;
 			} else {
 				$waiting++;
 			}
 		}
 
-	if ($waiting < $executed){
+		if ($waiting < $executed) {
 			$status = "PENDING";
 			$online = true;
 		}
@@ -346,9 +360,10 @@ static function executeTermostatMode($subDeviceId, $executionCommand){
 		];
 
 		return $commandTemp;
-}
+	}
 
-static function executeVolume($subDeviceId, $executionCommand){
+	static function executeVolume($subDeviceId, $executionCommand)
+	{
 		//echo $executionCommand['params']['volumeLevel'];
 		$status = 'OFFLINE';
 		$online = false;
@@ -360,13 +375,13 @@ static function executeVolume($subDeviceId, $executionCommand){
 			$executed = 0;
 			$waiting = 0;
 			foreach (RecordManager::getLastRecord($subDeviceId, 4) as $key => $value) {
-			if ($value['execuded'] == 1){
+				if ($value['execuded'] == 1) {
 					$executed++;
 				} else {
 					$waiting++;
 				}
 			}
-		if ($waiting < $executed){
+			if ($waiting < $executed) {
 				$status = "PENDING";
 				$online = true;
 				$currentVolume = $executionCommand['params']['volumeLevel'];
@@ -384,9 +399,10 @@ static function executeVolume($subDeviceId, $executionCommand){
 		];
 
 		return $commandTemp;
-}
+	}
 
-static function executeApp($subDeviceId, $executionCommand){
+	static function executeApp($subDeviceId, $executionCommand)
+	{
 		//echo $executionCommand['params']['newApplication'];
 		$status = 'OFFLINE';
 		$online = false;
@@ -398,13 +414,13 @@ static function executeApp($subDeviceId, $executionCommand){
 			$executed = 0;
 			$waiting = 0;
 			foreach (RecordManager::getLastRecord($subDeviceId, 4) as $key => $value) {
-			if ($value['execuded'] == 1){
+				if ($value['execuded'] == 1) {
 					$executed++;
 				} else {
 					$waiting++;
 				}
 			}
-		if ($waiting < $executed){
+			if ($waiting < $executed) {
 				$status = "PENDING";
 				$online = true;
 				$currentApplication = $executionCommand['params']['newApplication'];
@@ -422,9 +438,10 @@ static function executeApp($subDeviceId, $executionCommand){
 		];
 
 		return $commandTemp;
-}
+	}
 
-static function executeInput($subDeviceId, $executionCommand){
+	static function executeInput($subDeviceId, $executionCommand)
+	{
 		//echo $executionCommand['params']['newInput'];
 		$status = 'OFFLINE';
 		$online = false;
@@ -436,13 +453,13 @@ static function executeInput($subDeviceId, $executionCommand){
 			$executed = 0;
 			$waiting = 0;
 			foreach (RecordManager::getLastRecord($subDeviceId, 4) as $key => $value) {
-			if ($value['execuded'] == 1){
+				if ($value['execuded'] == 1) {
 					$executed++;
 				} else {
 					$waiting++;
 				}
 			}
-		if ($waiting < $executed){
+			if ($waiting < $executed) {
 				$status = "PENDING";
 				$online = true;
 				$currentInput = $executionCommand['params']['newInput'];
@@ -460,9 +477,10 @@ static function executeInput($subDeviceId, $executionCommand){
 		];
 
 		return $commandTemp;
-}
+	}
 
-static function executeMediaCont($subDeviceId, $executionCommand){
+	static function executeMediaCont($subDeviceId, $executionCommand)
+	{
 		$status = 'SUCCESS';
 		$online = true;
 
@@ -476,5 +494,5 @@ static function executeMediaCont($subDeviceId, $executionCommand){
 		];
 
 		return $commandTemp;
-}
+	}
 }

app/models/managers/RecordManager.php

@@ -2,16 +2,21 @@
 class RecordManager{
 	public static $records;
 
-	public static function createWithSubId ($subDeviceId,  $value) {
+	public static function createWithSubId ($subDeviceId, $value, $origin = false) {
 		try {
 			$record = [
 				'execuded' => 1,
 			];
+
 			Db::edit ('records', $record, 'WHERE subdevice_id = ?', array ($subDeviceId));
 			$record = array (
 				'subdevice_id' => $subDeviceId,
 				'value' => $value,
 			);
+
+			if ($origin != false)
+				$record['Origin'] = $origin;
+
 			return Db::add ('records', $record);
 		} catch(PDOException $error) {
 			echo $error->getMessage();
@@ -19,7 +24,7 @@ class RecordManager{
 		}
 	}
 
-	public static function create ($deviceId, $type, $value) {
+	public static function create ($deviceId, $type, $value, $origin = false) {
 		$subDeviceId = Db::loadOne('SELECT * FROM subdevices WHERE device_id = ? AND type = ?;', array($deviceId, $type))['subdevice_id'];
 		if ($subDeviceId == '') {
 			return false;
@@ -28,7 +33,7 @@ class RecordManager{
 		//Ochrana proti duplicitním hodnotám zapisují se jen změny
 		$lastRecord = self::getLastRecord($subDeviceId, 1);
 
-		if ($lastRecord['value'] == $value){
+		if (isset($lastRecord['value']) && $lastRecord['value'] == $value){
 			return false;
 		}
 
@@ -42,6 +47,10 @@ class RecordManager{
 				'subdevice_id' => $subDeviceId,
 				'value' => $value,
 			);
+
+			if ($origin != false)
+				$record['Origin'] = $origin;
+
 			return Db::add ('records', $record);
 		} catch(PDOException $error) {
 			echo $error->getMessage();

app/plugins/!AirQuality.php

@@ -22,7 +22,7 @@ class AirQuality extends VirtualDeviceManager
 
 				$finalUrl = sprintf($this->api_uri, $this->city_sluig, $this->app_id);
 				$json = json_decode(Utilities::CallAPI('GET', $finalUrl, ''), true);
-				RecordManager::create($deviceId, $this->subdevice_type, $json['data']['aqi']);
+				RecordManager::create($deviceId, $this->subdevice_type, $json['data']['aqi'], 'plugin');
 			} else {
 				DeviceManager::create($this->virtual_device_name, $this->virtual_device_name, 'senzore-virtual');
 				DeviceManager::approved($this->virtual_device_name);

app/plugins/AirQuality.php

@@ -30,7 +30,7 @@ class AirQuality extends VirtualDeviceManager
 
 				$finalUrl = sprintf($this->api_uri, $this->city_sluig, $this->app_id);
 				$json = json_decode(Utilities::CallAPI('GET', $finalUrl, ''), true);
-				RecordManager::create($deviceId, $this->subdevice_type, $json['data']['aqi']);
+				RecordManager::create($deviceId, $this->subdevice_type, $json['data']['aqi'], 'plugin');
 			} else {
 				DeviceManager::create($this->virtual_device_name, $this->virtual_device_name, 'senzore-virtual');
 				DeviceManager::approved($this->virtual_device_name);

app/plugins/CovidV2.php

@@ -31,7 +31,7 @@ class CovidV2 extends VirtualDeviceManager
 				$json = json_decode(Utilities::CallAPI('GET', $finalUrl, ''), true)['data'];
 
 				foreach ($dataItems as $dataItem) {
-					RecordManager::create($deviceId, strtolower($dataItem), end($json)[$this->name_index[$dataItem]]);
+					RecordManager::create($deviceId, strtolower($dataItem), end($json)[$this->name_index[$dataItem]], 'plugin');
 				}
 			} else {
 				DeviceManager::create($this->virtual_device_name, $this->virtual_device_name, strtolower($this->virtual_device_name));

app/plugins/DameJidlo.php

@@ -0,0 +1,85 @@
+<?php
+class DameJidlo extends VirtualDeviceManager
+{
+    private $virtual_device_name = "Dáme Jídlo";
+    private $device_type = "virtual-device";
+    private $subdevice_type = "dame-jidlo";
+
+    public function deliveryTime($token)
+    {        
+        // Generated by curl-to-PHP: http://incarnate.github.io/curl-to-php/
+        $ch = curl_init();
+
+        curl_setopt($ch, CURLOPT_URL, 'https://cz.fd-api.com/api/v5/tracking/active-orders?time_variation=Variation2');
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
+
+        curl_setopt($ch, CURLOPT_ENCODING, 'gzip, deflate');
+
+        $headers = array();
+        $headers[] = 'Authority: cz.fd-api.com';
+        $headers[] = 'Sec-Ch-Ua: \"Chromium\";v=\"88\", \"Google Chrome\";v=\"88\", \";Not A Brand\";v=\"99\"';
+        $headers[] = 'Accept: application/json, text/plain, */*';
+        $headers[] = 'Authorization: Bearer ' . $token;
+        $headers[] = 'X-Pd-Language-Id: 2';
+        $headers[] = 'Sec-Ch-Ua-Mobile: ?0';
+        $headers[] = 'X-Fp-Api-Key: volo';
+        $headers[] = 'User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36';
+        $headers[] = 'Origin: https://www.damejidlo.cz';
+        $headers[] = 'Sec-Fetch-Site: cross-site';
+        $headers[] = 'Sec-Fetch-Mode: cors';
+        $headers[] = 'Sec-Fetch-Dest: empty';
+        $headers[] = 'Referer: https://www.damejidlo.cz/';
+        $headers[] = 'Accept-Language: en-US,en;q=0.9,cs-CZ;q=0.8,cs;q=0.7';
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+
+        $result = curl_exec($ch);
+        if (curl_errno($ch)) {
+            echo 'Error:' . curl_error($ch);
+        }
+        curl_close($ch);
+
+        return  (isset(json_decode($result, true)['data']['active_orders'][0]['delivery']['time']['eta']) ? json_decode($result, true)['data']['active_orders'][0]['delivery']['time']['eta'] : 0);
+    }
+
+    function make()
+    {
+        //Register the settings
+        $settingMng = new SettingsManager();
+		if (!($settingField = $settingMng->getByName("damejidlo_token","damejidlo"))) {
+			$settingMng->create("damejidlo_token", "", "damejidlo");
+		} else {
+			$bearer = $settingField['value'];
+        }
+
+        try {
+            if (DeviceManager::registeret($this->virtual_device_name)) {
+                $deviceId = DeviceManager::getDeviceByToken($this->virtual_device_name)['device_id'];
+                if (!$subDevice = SubDeviceManager::getSubDeviceByMaster($deviceId, $this->subdevice_type)) {
+                    SubDeviceManager::create($deviceId, $this->subdevice_type, '');
+                    sleep(1);
+                    $subDevice = SubDeviceManager::getSubDeviceByMaster($deviceId, strtolower($this->subdevice_type));
+                }
+
+                //if (!$this->fetchEnabled($deviceId,$subDevice['subdevice_id'])) die();
+
+                RecordManager::create($deviceId, $this->subdevice_type, $this->deliveryTime($bearer), 'plugin');
+            } else {
+                DeviceManager::create($this->virtual_device_name, $this->virtual_device_name, 'senzore-virtual');
+                DeviceManager::approved($this->virtual_device_name);
+            }
+            return 'sucessful';
+        } catch (Exception $e) {
+            return 'exception: ' . $e->getMessage();
+        }
+    }
+
+    function translate($value){
+		if ($value == 0) {
+            return " Delivered";
+        } else if ($value <= 1) {
+            return "less " . $value;
+        }
+		return '';
+	}
+}

app/plugins/N7day.php

@@ -29,7 +29,7 @@ class N7Day extends VirtualDeviceManager
 				$datediff = $now - $your_date;
 				$daysUntilN7Day = round($datediff / (60 * 60 * 24));
 				
-				RecordManager::create($deviceId, $this->subdevice_type, $daysUntilN7Day);
+				RecordManager::create($deviceId, $this->subdevice_type, $daysUntilN7Day, 'plugin');
 			} else {
 				DeviceManager::create($this->virtual_device_name, $this->virtual_device_name, $this->device_type);
 				DeviceManager::approved($this->virtual_device_name);

app/plugins/OpenWeatherMap.php

@@ -55,7 +55,7 @@ class OpenWeatherMap extends VirtualDeviceManager
 				}
 
 
-				RecordManager::create($deviceId, $this->subdevice_type, $json['weather'][0]['id']);
+				RecordManager::create($deviceId, $this->subdevice_type, $json['weather'][0]['id'], 'plugin');
 			} else {
 				DeviceManager::create($this->virtual_device_name, $this->virtual_device_name, 'senzore-virtual');
 				DeviceManager::approved($this->virtual_device_name);

app/plugins/UsaElection.php

@@ -52,7 +52,7 @@ class UsaElection extends VirtualDeviceManager
 				$OnePercent = ($Trump + $Biden + $Unknown) / 100;
 
 				foreach ($dataItems as $Category) {
-					RecordManager::create($deviceId, strtolower($Category), round(($$Category / $OnePercent)));
+					RecordManager::create($deviceId, strtolower($Category), round(($$Category / $OnePercent)), 'plugin');
 				}
 			} else {
 				DeviceManager::create($this->virtual_device_name, $this->virtual_device_name, 'senzore-virtual');