Ca se trouve c’est les modules inconnu après la de toute facon sans log je ne peux rien faire.
Non ce sont des Doorprotect classiques comme les autres
Utilisez le code ci-dessus, et ils seront alors identifiés.
ça annule et remplace le fichier ou ce n’est qu’une partie ?
je ne suis pas trop familier sur l’éditeur
Vous trouverez ci-dessous le contenu complet du fichier ajaxSystem.class.php.
<?php
/* This file is part of Jeedom.
*
* Jeedom is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Jeedom is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Jeedom. If not, see <http://www.gnu.org/licenses/>.
*/
/* * ***************************Includes********************************* */
require_once __DIR__ . '/../../../../core/php/core.inc.php';
class ajaxSystem extends eqLogic {
/* * *************************Attributs****************************** */
/* * ***********************Methode static*************************** */
public static function templateWidget() {
$return = array('info' => array('string' => array()));
$return['info']['string']['state'] = array(
'template' => 'tmplmultistate',
'test' => array(
array('operation' => '#value# == "ARMED"', 'state_light' => '<i class="fas fa-lock"></i>'),
array('operation' => '#value# == "DISARMED"', 'state_light' => '<i class="fas fa-lock-open"></i>'),
array('operation' => '#value# == "ARMED_NIGHT_MODE_OFF"', 'state_light' => '<i class="fas fa-lock"></i>'),
array('operation' => '#value# == "DISARMED_NIGHT_MODE_ON"', 'state_light' => '<i class="fas fa-moon"></i>'),
array('operation' => '#value# == "DISARMED_NIGHT_MODE_OFF"', 'state_light' => '<i class="fas fa-lock-open"></i>'),
array('operation' => '#value# == "NIGHT_MODE"', 'state_light' => '<i class="fas fa-moon"></i>'),
array('operation' => '#value# == "ARMED_NIGHT_MODE_ON"', 'state_light' => '<i class="fas fa-lock"></i>'),
array('operation' => '#value# == "PANIC"', 'state_light' => '<i class="fas fa-exclamation-circle"></i>')
)
);
return $return;
}
public static function request($_path, $_data = null, $_type = 'GET') {
$url = config::byKey('service::cloud::url') . '/service/ajaxSystem';
$url .= '?path=' . urlencode(str_replace('{userId}', config::byKey('userId', 'ajaxSystem'), $_path));
if ($_path != '/login' && $_path != '/refresh') {
$mc = cache::byKey('ajaxSystem::sessionToken');
$sessionToken = $mc->getValue();
if (trim($mc->getValue()) == '') {
$sessionToken = self::refreshToken();
}
$url .= '&session_token=' . $sessionToken;
}
if ($_data !== null && $_type == 'GET') {
$url .= '&options=' . urlencode(json_encode($_data));
}
$request_http = new com_http($url);
$request_http->setHeader(array(
'Content-Type: application/json',
'Autorization: ' . sha512(mb_strtolower(config::byKey('market::username')) . ':' . config::byKey('market::password'))
));
log::add('ajaxSystem', 'debug', '[request] ' . $url . ' => ' . json_encode($_data));
if ($_type == 'POST') {
$request_http->setPost(json_encode($_data));
}
if ($_type == 'PUT') {
$request_http->setPut(json_encode($_data));
}
$return = json_decode($request_http->exec(60, 3), true);
$return = is_json($return, $return);
if (isset($return['error']) || isset($return['errors'])) {
sleep(rand(1,30));
$return = json_decode($request_http->exec(60, 3), true);
$return = is_json($return, $return);
}
if (isset($return['error']) || isset($return['errors'])) {
throw new \Exception(__('Erreur lors de la requete à Ajax System : ', __FILE__) . json_encode($return));
}
if (isset($return['body'])) {
return $return['body'];
}
log::add('ajaxSystem', 'debug', json_encode($return));
return $return;
}
public static function start() {
self::refreshAllData();
}
public static function refreshAllData() {
foreach (eqLogic::byType('ajaxSystem', true) as $eqLogic) {
try {
sleep(rand(10, 60));
$eqLogic->refreshData();
if ($eqLogic->getCache('failedAjaxRequest', 0) > 0) {
$eqLogic->setCache('failedAjaxRequest', 0);
}
} catch (\Exception $e) {
$eqLogic->setCache('failedAjaxRequest', $eqLogic->getCache('failedAjaxRequest', 0) + 1);
if ($eqLogic->getCache('failedAjaxRequest', 0) > 3) {
log::add('ajaxSystem', 'error', __('Erreur lors de la mise à jour des données de :', __FILE__) . ' ' . $eqLogic->getHumanName() . ' => ' . $e->getMessage(), 'ajaxSystem::failedGetData' . $eqLogic->getId());
}
}
}
}
public static function login($_username, $_password) {
if (trim(network::getNetworkAccess('external')) == '') {
throw new Exception(__('URL d\'accès externe de votre Jeedom invalide. Merci de la configurer dans Réglage -> Système -> Configuration puis onglet Réseaux'));
}
$data = self::request('/login', array(
'login' => $_username,
'passwordHash' => $_password,
'userRole' => 'USER',
'apikey' => jeedom::getApiKey('ajaxSystem'),
'url' => network::getNetworkAccess('external')
), 'POST');
log::add('ajaxSystem', 'debug', '[login] ' . json_encode($data));
config::save('refreshToken', $data['refreshToken'], 'ajaxSystem');
config::save('userId', $data['userId'], 'ajaxSystem');
cache::set('ajaxSystem::sessionToken', $data['sessionToken'], 60 * 14);
}
public static function refreshToken() {
$data = self::request('/refresh', array(
'userId' => config::byKey('userId', 'ajaxSystem'),
'refreshToken' => config::byKey('refreshToken', 'ajaxSystem')
), 'POST');
log::add('ajaxSystem', 'debug', '[refreshToken] ' . json_encode($data));
if ($data['refreshToken'] == '') {
log::add('ajaxSystem', 'debug', '[refreshToken] Empty refresh token, retry in 5s');
sleep(5);
$data = self::request('/refresh', array(
'userId' => config::byKey('userId', 'ajaxSystem'),
'refreshToken' => config::byKey('refreshToken', 'ajaxSystem')
), 'POST');
log::add('ajaxSystem', 'debug', '[refreshToken] ' . json_encode($data));
}
if ($data['refreshToken'] == '') {
throw new Exception(__('Impossible de mettre à jour les tokens d\'accès, refresh token vide : ', __FILE__) . json_encode($data));
}
config::save('refreshToken', $data['refreshToken'], 'ajaxSystem');
cache::set('ajaxSystem::sessionToken', $data['sessionToken'], 60 * 14);
return $data['sessionToken'];
}
public static function sync() {
$hubs = self::request('/user/{userId}/hubs');
//log::add('ajaxSystem', 'debug', json_encode($hubs));
foreach ($hubs as $hub) {
$hub_info = self::request('/user/{userId}/hubs/' . $hub['hubId']);
//log::add('ajaxSystem', 'debug', json_encode($hub_info));
$eqLogic = eqLogic::byLogicalId($hub['hubId'], 'ajaxSystem');
if (!is_object($eqLogic)) {
$eqLogic = new ajaxSystem();
$eqLogic->setEqType_name('ajaxSystem');
$eqLogic->setIsEnable(1);
$eqLogic->setName($hub_info['name']);
$eqLogic->setCategory('security', 1);
$eqLogic->setIsVisible(1);
}
$eqLogic->setConfiguration('type', 'hub');
$eqLogic->setConfiguration('color', $hub_info['color']);
$eqLogic->setConfiguration('device', $hub_info['hubSubtype']);
$eqLogic->setConfiguration('ip', $hub_info['ethernet']['ip']);
$eqLogic->setConfiguration('firmware', $hub_info['firmware']['version']);
$eqLogic->setLogicalId($hub['hubId']);
$eqLogic->save();
$eqLogic->refreshData($hub_info); //give already obtained data to refresh function
$devices = self::request('/user/{userId}/hubs/' . $hub['hubId'] . '/devices');
log::add('ajaxSystem', 'debug', 'Number of devices found for hub: ' . $hub['hubId'] . ': ' . count($devices));
foreach ($devices as $device) {
if (!isset($device['id'])) {
continue;
}
// Identify whether the device exists already in Jeedom
$eqLogic = eqLogic::byLogicalId($device['id'], 'ajaxSystem');
// Only obtain extra info if the data is not available in the original devices list
$device_info = $device;
if (!isset($device['deviceName']) || !isset($device['deviceType'])) {
$device_info = self::request('/user/{userId}/hubs/' . $hub['hubId'] . '/devices/' . $device['id']);
log::add('ajaxSystem', 'debug', 'Retrieve Extra info fo: ' . $device['id']);
usleep(200000); // short brake to reduce impact on API
}
if (!$device_info || !isset($device_info['id'])) {
log::add('ajaxSystem', 'warning', 'Not able to retrieve data for device with ID: ' . $device['id']);
continue;
}
// Create only a new object if required
if (!is_object($eqLogic)) {
$eqLogic = new ajaxSystem();
$eqLogic->setEqType_name('ajaxSystem');
$eqLogic->setLogicalId($device_info['id']);
$eqLogic->setIsEnable(1);
$eqLogic->setIsVisible(1);
$eqLogic->setCategory('security', 1);
}
// Update data (also for existing devices)
$hasChanged = false;
if ($eqLogic->getName() !== $device_info['deviceName']) {
$eqLogic->setName($device_info['deviceName']);
$hasChanged = true;
}
// Update config and check changes
$configs = [
'hub_id' => $hub['hubId'],
'type' => 'device',
'color' => $device_info['color'] ?? '',
'device' => $device_info['deviceType'] ?? '',
'firmware' => $device_info['firmwareVersion'] ?? ''
];
foreach ($configs as $key => $value) {
if ($eqLogic->getConfiguration($key) !== $value) {
$eqLogic->setConfiguration($key, $value);
$hasChanged = true;
}
}
// Only store changes, not existing data to reduce impact on db
if ($hasChanged || $eqLogic->getId() == null) {
$eqLogic->save();
log::add('ajaxSystem', 'info', 'Device updated/added: ' . $device_info['deviceName']);
}
$eqLogic->refreshData($device_info); //give already obtained data to refresh function
}
$groups = self::request('/user/{userId}/hubs/' . $hub['hubId'] . '/groups');
log::add('ajaxSystem', 'debug', 'Number of groups: ' . count($groups));
foreach ($groups as $group) {
$eqLogic = eqLogic::byLogicalId($group['id'], 'ajaxSystem');
if (!is_object($eqLogic)) {
$eqLogic = new ajaxSystem();
$eqLogic->setEqType_name('ajaxSystem');
$eqLogic->setIsEnable(1);
$eqLogic->setName($group['groupName']);
$eqLogic->setCategory('security', 1);
$eqLogic->setIsVisible(1);
}
$eqLogic->setConfiguration('hub_id', $hub['hubId']);
$eqLogic->setConfiguration('type', 'group');
$eqLogic->setConfiguration('device', 'group');
$eqLogic->setLogicalId($group['id']);
$eqLogic->save();
$eqLogic->refreshData($group); //give already obtained data to refresh function
}
}
}
public static function devicesParameters($_device = '') {
$return = array();
$files = ls(__DIR__ . '/../config/devices', '*.json', false, array('files', 'quiet'));
foreach ($files as $file) {
try {
$return[str_replace('.json', '', $file)] = is_json(file_get_contents(__DIR__ . '/../config/devices/' . $file), false);
} catch (Exception $e) {
}
}
if (isset($_device) && $_device != '') {
if (isset($return[$_device])) {
return $return[$_device];
}
return array();
}
return $return;
}
/* * *********************Méthodes d'instance************************* */
public function postSave() {
if ($this->getConfiguration('applyDevice') != $this->getConfiguration('device')) {
$this->applyModuleConfiguration();
}
foreach ($this->getCmd() as $cmd) {
if(strpos($cmd->getLogicalId(),'sia') !== false){
$cmd->remove();
}
}
}
public function applyModuleConfiguration() {
$this->setConfiguration('applyDevice', $this->getConfiguration('device'));
$this->save();
if ($this->getConfiguration('device') == '') {
return true;
}
$device = self::devicesParameters($this->getConfiguration('device'));
if (!is_array($device)) {
return true;
}
$this->import($device, true);
}
public function getImage() {
if(method_exists($this,'getCustomImage')){
$customImage = $this->getCustomImage();
if($customImage !== null){
return $customImage;
}
}
if (file_exists(__DIR__ . '/../config/devices/' . $this->getConfiguration('device') . '_' . strtolower($this->getConfiguration('color')) . '.png')) {
return 'plugins/ajaxSystem/core/config/devices/' . $this->getConfiguration('device') . '_' . strtolower($this->getConfiguration('color')) . '.png';
}
if (file_exists(__DIR__ . '/../config/devices/' . $this->getConfiguration('device') . '.png')) {
return 'plugins/ajaxSystem/core/config/devices/' . $this->getConfiguration('device') . '.png';
}
return false;
}
public function refreshData($_data = null) {
$datas=$_data; //reuse data from sync function
if (isset($datas['firmwareVersion']) && $datas['firmwareVersion'] != $this->getConfiguration('firmware')) {
$this->setConfiguration('firmware', $datas['firmwareVersion']);
$this->save(true);
}
foreach ($this->getCmd('info') as $cmd) {
$paths = explode('::', $cmd->getLogicalId());
$value = $datas;
foreach ($paths as $key) {
if (!isset($value[$key])) {
continue 2;
}
$value = $value[$key];
}
$this->checkAndUpdateCmd($cmd, $value);
}
//Refresh batterie depuis trame de synchronisation / refresh
$batteryChargeLevel = '-1';
if (isset($datas['batteryChargeLevelPercentage'])) {
$batteryChargeLevel = $datas['batteryChargeLevelPercentage'];
}
if (isset($datas['battery']) && isset($datas['battery']['chargeLevelPercentage'])) {
$batteryChargeLevel = $datas['battery']['chargeLevelPercentage'];
}
//Si niveau de charge numérique disponible, mise à jour de l'information
if($batteryChargeLevel != '-1'){
//Au niveau de l'équipement
$this->batteryStatus($batteryChargeLevel);
$this->checkAndUpdateCmd('battery::chargeLevelPercentage', $value);
}
}
/* * **********************Getteur Setteur*************************** */
}
class ajaxSystemCmd extends cmd {
/* * *************************Attributs****************************** */
/* * ***********************Methode static*************************** */
/* * *********************Methode d'instance************************* */
public function alreadyInState($_options) {
$eqLogic = $this->getEqLogic();
if ($eqLogic->getConfiguration('type') == 'hub') {
$cmdValue = $this->getCmdValue();
$value = $cmdValue->execCmd();
if ($this->getLogicalId() == 'ARM') {
return ($value == 'ARMED');
}
if ($this->getLogicalId() == 'DISARM') {
return ($value == 'DISARMED_NIGHT_MODE_OFF' || $value == 'DISARMED');
}
if ($this->getLogicalId() == 'NIGHT_MODE') {
return ($value == 'NIGHT_MODE');
}
if ($this->getLogicalId() == 'PANIC' || $this->getLogicalId() == 'muteFireDetectors') {
return false;
}
}
if ($eqLogic->getConfiguration('type') == 'group') {
return false;
}
return parent::alreadyInState($_options);
}
public function execute($_options = array()) {
$eqLogic = $this->getEqLogic();
if ($eqLogic->getConfiguration('type') == 'hub') {
if ($this->getLogicalId() == 'ARM') {
ajaxSystem::request('/user/{userId}/hubs/' . $eqLogic->getLogicalId() . '/commands/arming', array('command' => 'ARM', 'ignoreProblems' => true), 'PUT');
} else if ($this->getLogicalId() == 'DISARM') {
ajaxSystem::request('/user/{userId}/hubs/' . $eqLogic->getLogicalId() . '/commands/arming', array('command' => 'DISARM', 'ignoreProblems' => true), 'PUT');
} else if ($this->getLogicalId() == 'NIGHT_MODE') {
ajaxSystem::request('/user/{userId}/hubs/' . $eqLogic->getLogicalId() . '/commands/arming', array('command' => 'NIGHT_MODE_ON', 'ignoreProblems' => true), 'PUT');
} else if ($this->getLogicalId() == 'PANIC') {
ajaxSystem::request('/user/{userId}/hubs/' . $eqLogic->getLogicalId() . '/commands/panic', array('location' => array('latitude' => 0, 'longitude' => 0, 'accuracy' => 0, 'speed' => 0, 'timestamp' => 0)), 'PUT');
} else if ($this->getLogicalId() == 'muteFireDetectors') {
ajaxSystem::request('/user/{userId}/hubs/' . $eqLogic->getLogicalId() . '/commands/muteFireDetectors', array('muteType' => 'ALL_FIRE_DETECTORS'), 'PUT');
}
} else if ($eqLogic->getConfiguration('type') == 'device') {
$command = array(
'command' => $this->getLogicalId(),
'deviceType' => $eqLogic->getConfiguration('device')
);
ajaxSystem::request('/user/{userId}/hubs/' . $eqLogic->getConfiguration('hub_id') . '/devices/' . $eqLogic->getLogicalId() . '/command', $command, 'POST');
} else if ($eqLogic->getConfiguration('type') == 'group') {
if ($this->getLogicalId() == 'ARM') {
ajaxSystem::request('/user/{userId}/hubs/' . $eqLogic->getConfiguration('hub_id') . '/groups/' . $eqLogic->getLogicalId() . '/commands/arming', array('command' => 'ARM', 'ignoreProblems' => true), 'PUT');
} else if ($this->getLogicalId() == 'DISARM') {
ajaxSystem::request('/user/{userId}/hubs/' . $eqLogic->getConfiguration('hub_id') . '/groups/' . $eqLogic->getLogicalId() . '/commands/arming', array('command' => 'DISARM', 'ignoreProblems' => true), 'PUT');
} else if ($this->getLogicalId() == 'NIGHT_MODE') {
ajaxSystem::request('/user/{userId}/hubs/' . $eqLogic->getConfiguration('hub_id') . '/groups/' . $eqLogic->getLogicalId() . '/commands/arming', array('command' => 'NIGHT_MODE_ON', 'ignoreProblems' => true), 'PUT');
}
}
}
/* * **********************Getteur Setteur*************************** */
}
Super ça fonctionne très bien, je retrouve tous mes équipements
Merci
Euh j’ai peut etre parlé trop vite
Maintenant j’ai une erreur en rouge
core/ajax/eqLogic.ajax.php : Error /error: Syntax error, unrecognized expression: . /async:true /type:POST /dataType:json /action:get
Edit : NON rien a voir Désolé 
Je ne suis pas sûr de la manière dont vous avez inclus le code. Les indentations sont-elles correctes ? Cette erreur est liée à la façon dont vous avez inséré le code dans votre instance Jeedom.
Rien a voir
Merci
Commencez par supprimer les appareils aux noms étranges, puis synchronisez à nouveau.
Tout est OK 
1 « J'aime »
Bonjour,
Merci pour ces retours, une nouvelle version stable sortira demain et intègrera certaine modification de @Dirk pour réduire le nombre de requêtes. J’ai aussi augmenter la nombre de requête possible sur le cloud. Les deux ensemble devrais je l’espere corriger les soucis que vous avez.
1 « J'aime »