Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-04-22 17:36:29 +02:00
Code Issues Projects Releases Wiki Activity

All working reception and sending with webhook. Commands still to test. Update test adapter to use local files

Browse source
This commit is contained in:
osaajani 2020-01-07 17:55:16 +01:00
parent b5a36b1169
commit 768714cc1a
7 changed files with 80 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

39
daemons/Phone.php
View file

@ -69,15 +69,22 @@ class Phone extends AbstractDaemon
*/
private function send_smss ()
{
//Call message
$msgtype = null;
$maxsize = 409600;
$message = null;
$find_message = true;
while ($find_message)
{
msg_receive($this->msg_queue, QUEUE_TYPE_SEND_MSG, $msgtype, $maxsize, $message);
//Call message
$msgtype = null;
$maxsize = 409600;
$message = null;
$error_code = null;
$success = msg_receive($this->msg_queue, QUEUE_TYPE_SEND_MSG, $msgtype, $maxsize, $message, TRUE, MSG_IPC_NOWAIT, $error_code); //MSG_IPC_NOWAIT == dont wait if no message found
if (!$success && $error_code !== MSG_ENOMSG)
{
$this->logger->critical('Error reading MSG SEND Queue, error code : ' . $error);
return false;
}
if (!$message)
{
@ -98,7 +105,7 @@ class Phone extends AbstractDaemon
$sended_sms_uid = $this->adapter->send($message['destination'], $message['text'], $message['flash']);
if (!$sended_sms_uid)
{
$this->logger->info('Failed send message : ' . json_encode($message));
$this->logger->error('Failed send message : ' . json_encode($message));
$internal_sended->create($at, $message['text'], $message['origin'], $message['destination'], $sended_sms_uid, $this->phone['adapter'], $message['flash'], 'failed');
continue;
}
@ -106,7 +113,7 @@ class Phone extends AbstractDaemon
//Run webhook
$internal_setting = new \controllers\internals\Setting($this->bdd);
$user_settings = $internal_setting->gets_for_user($this->phone['id_user']);
process_for_webhook($message, 'send_sms', $user_settings);
$this->process_for_webhook($message, 'send_sms', $user_settings);
$this->logger->info('Successfully send message : ' . json_encode($message));
@ -122,7 +129,6 @@ class Phone extends AbstractDaemon
private function read_smss ()
{
$internal_received = new \controllers\internals\Received($this->bdd);
$internal_command = new \controllers\internals\Command($this->bdd);
$internal_setting = new \controllers\internals\Setting($this->bdd);
$smss = $this->adapter->read();
@ -146,7 +152,7 @@ class Phone extends AbstractDaemon
$this->process_for_webhook($sms, 'receive_sms', $user_settings);
$this->internal_received->create($sms['at'], $sms['text'], $sms['origin'], $sms['destination'], 'unread', $is_command);
$internal_received->create($sms['at'], $sms['text'], $sms['origin'], $sms['destination'], 'unread', $is_command);
}
}
@ -158,15 +164,18 @@ class Phone extends AbstractDaemon
*/
private function process_for_command (array $sms)
{
$internal_command = new \controllers\internals\Command($this->bdd);
$is_command = false;
$command = $internal_command->check_for_command($this->phone['id_user'], $sms['text']);
if ($command)
{
$is_command = true;
$sms['text'] = $command['updated_text'];
exec($command['command']);
}
return ['text' => $command['updated_text'], 'is_command' => $is_command];
return ['text' => $sms['text'], 'is_command' => $is_command];
}
@ -198,7 +207,13 @@ class Phone extends AbstractDaemon
'destination' => $sms['destination'],
],
];
msg_send($this->webhook_queue, QUEUE_TYPE_WEBHOOK, $webhook);
$error_code = null;
$success = msg_send($this->webhook_queue, QUEUE_TYPE_WEBHOOK, $message, TRUE, TRUE, $error_code);
if (!$success)
{
$this->logger->critical("Failed send webhook message in queue, error code : " . $error_code);
}
}
}

17
daemons/Webhook.php
View file

@ -39,15 +39,20 @@ class Webhook extends AbstractDaemon
public function run()
{
//Call message
$msgtype = null;
$maxsize = 409600;
$message = null;
$find_message = true;
while ($find_message)
{
msg_receive($this->webhook_queue, QUEUE_ID_WEBHOOK, $msgtype, $maxsize, $message);
//Call message
$msgtype = null;
$maxsize = 409600;
$message = null;
$error_code = null;
$success = msg_receive($this->webhook_queue, QUEUE_TYPE_WEBHOOK, $msgtype, $maxsize, $message, true, 0, $error_code);
if (!$success)
{
$this->logger->critical('Error for webhook queue reading, error code : ' . $error_code);
}
if (!$message)
{