@@ -3,21 +3,23 @@

 use strict;

 use warnings;

-use Net::XMPP;

 use DBI;

 use POSIX qw/ceil strftime/;

+use HiPi::Huawei::E3531;

+use HiPi::Huawei::Errors;

 use open ':utf8';

 use open ':std';

 use utf8;

-#use Data::Dumper;

+

+use Data::Dumper;

 use threads;

 use threads::shared;

 use Thread::Queue;

+use Thread::Semaphore;

-$ENV{PWD} = "" if not defined $ENV{PWD};

-my $scriptconf = $ENV{PWD} . "/$0";

+my $scriptconf = $0;

 $scriptconf =~ s/\.pl$//;

 $scriptconf =~ s/$/.conf/;

 if (-r $scriptconf) {

@@ -34,146 +36,46 @@ else {

 }

 $SIG{INT}=\&terminate;

-#my $next_sms :shared; # utilisé pour le top du procahin envoi

-my $debugLevel = 0;

-

-my $phone_status : shared = "";

-my $from_gtalksms_queue = Thread::Queue->new;

-my $to_gtalksms_queue = Thread::Queue->new;

+my $inbox_sms_queue = Thread::Queue->new;

+my $outbox_sms_queue = Thread::Queue->new;

 my $mail_queue = Thread::Queue->new;

-my $bot = &xmpp_login($cfg::config{xmpp}->{hostName}, 

-                      $cfg::config{xmpp}->{portNumber}, 

-                      $cfg::config{xmpp}->{userName}, 

-                      $cfg::config{xmpp}->{passWord}, 

-                      $cfg::config{xmpp}->{componentName}, 

-                      $cfg::config{xmpp}->{resource}, 

-                      $cfg::config{xmpp}->{tls}, 

-                      1, "", 0, 

-                      $cfg::config{DEBUG});

+my $mutex = Thread::Semaphore->new();

+STDERR->autoflush();

-$SIG{INT} = sub { $bot->Disconnect; };

+my $mail = threads->new(\&send_mail);

-my $mail = threads->new(\&ssmtp_send_mail);

+my $inbox_sms = threads->new(\&inbox_sms_parse);

-my $from_gtalksms = threads->new(\&from_gtalksms_parse);

+my $outbox_sms = threads->new(\&hilink_send_sms);

-my $to_gtalksms = threads->new(\&xmpp_send_sms);

-

-sub debug_print {

-    print STDERR "sendxmpp: " . (join ' ', @_) . "\n"

-	if (@_ && ($cfg::config{DEBUG} ||$cfg::config{VERBOSE}));

-}

+my $hlink = HiPi::Huawei::E3531->new();

 sub log_bot {

-#    open(LOGFILE,'>>', 'bot.log');

-#    print LOGFILE sprintf("[%s] %s\n",strftime("%Y-%m-%d %H:%M:%S", localtime), shift);

-    print  sprintf("[%s] %s\n",strftime("%Y-%m-%d %H:%M:%S", localtime), shift);

-#    close LOGFILE;

-}

-

-sub xmpp_logout($) {

-    # HACK

-    # messages may not be received if we log out too quickly...

-    sleep 1;

-

-    my $cnx = shift;

-    $cnx->Disconnect();

-    xmpp_check_result ('Disconnect',0); # well, nothing to check, really

+    $mutex->down();

+    print STDERR sprintf("%s\n", shift);

+    $mutex->up();

 }

 sub terminate () {

-    my $cnx = shift;

-    debug_print "caught TERM";

-    xmpp_logout($cnx);

+    log_bot($mail_queue->pending() . " mails en attente d'envoi !") if ($mail_queue->pending() > 0);

+    $mail->exit();

+    log_bot($inbox_sms_queue->pending() . " SMS en attente de traitement !") if ($inbox_sms_queue->pending() > 0);

+    $inbox_sms->exit();

+    log_bot($outbox_sms_queue->pending() . " SMS en attente d'envoi !") if ($outbox_sms_queue->pending() > 0);

+    $outbox_sms->exit();

+    log_bot("arrêt");

     exit 0;

 }

-sub error_exit {

-    my ($err,$cnx) = @_;

-    print STDERR "$err\n";

-    xmpp_logout ($cnx)

-	if ($cnx);

-    exit 1;

-}

-

-sub xmpp_check_result {

-    my ($txt, $res, $cnx)=@_;

-

-    error_exit ("Error '$txt': result undefined")

-	unless (defined $res);

-

-    # res may be 0

-	if ($res == 0) {

-		debug_print "$txt";

-		# result can be true or 'ok'

-	}

-	elsif ((@$res == 1 && $$res[0]) || $$res[0] eq 'ok') {

-		debug_print "$txt: " .  $$res[0];

-		# otherwise, there is some error

-	}

-	else {

-		my $errmsg = $cnx->GetErrorCode() || '?';

-		error_exit ("Error '$txt': " . join (': ',@$res) . "[$errmsg]", $cnx);

-	}

-}

-

-sub xmpp_login ($$$$$$$$$$$) {

-    my ($host, $port, $user, $pw, $comp, $res, $tls, $no_tls_verify, $tls_ca_path, $ssl, $debug) = @_;

-    my $cnx = new Net::XMPP::Client(debuglevel=>0);

-    error_exit "could not create XMPP client object: $!" unless ($cnx);

-

-	my $ssl_verify = 0x01;

-	if ($no_tls_verify) { $ssl_verify = 0x00; }

-	debug_print "ssl_verify: $ssl_verify";

-

-	debug_print "tls_ca_path: $tls_ca_path";

-

-    my @res;

-	my $arghash = {

-		hostname		=> $host,

-		port            => $port,

-		tls				=> $tls,

-		ssl_verify		=> $ssl_verify,

-		ssl_ca_path		=> $tls_ca_path,

-		ssl             => $ssl,

-		connectiontype	=> 'tcpip',

-		componentname	=> $comp

-	};

-

-	delete $arghash->{port} unless $port; 

-	if ($arghash->{port}) {

-		@res = $cnx->Connect(%$arghash);

-		error_exit ("Could not connect to '$host' on port $port: $@") unless @res;

-	} else {

-		@res = $cnx->Connect(%$arghash);

-		error_exit ("Could not connect to server '$host': $@") unless @res;

-	}

-

-    xmpp_check_result("Connect",\@res,$cnx);

-

-	if ($comp) {

-		my $sid = $cnx->{SESSION}->{id};

-		$cnx->{STREAM}->{SIDS}->{$sid}->{hostname} = $comp

-	}

-

-    @res = $cnx->AuthSend(#'hostname' => $host,

-			  'username' => $user,

-			  'password' => $pw,

-			  'resource' => $res);

-    xmpp_check_result('AuthSend',\@res,$cnx);

-

-    return $cnx;

-}

-

 sub sql_request ($) {

-    my $request = shift;

+    my $msg = shift;

     my @result;

     my $dbh = DBI->connect($cfg::config{db}->{driver}, $cfg::config{db}->{user}, $cfg::config{db}->{password}, {'RaiseError' => 1});

     $dbh->{'mysql_enable_utf8'} = 1;

     $dbh->do(qq{SET NAMES "utf8"});

-    my $sth = $dbh->prepare($request);

+    my $sth = $dbh->prepare($msg);

     $sth->execute();

     if (defined($sth->{NUM_OF_FIELDS})) {

         while (my $ref = $sth->fetchrow_hashref()) {

@@ -186,19 +88,19 @@ sub sql_request ($) {

 }

 sub massive_send_sms {

-    my $request = shift;

-    if ($to_gtalksms_queue->pending() > 0) {

-        $to_gtalksms_queue->insert(0, [$request->{phone}, "un envoi massif est déjà en cours, lancé par " . $cfg::config{last_sender} . ", reste " . $to_gtalksms_queue->pending() . ", annulation"]);

+    my $msg = shift;

+    if ($outbox_sms_queue->pending() > 0) {

+        $outbox_sms_queue->insert(0, [$msg->{Phone}, "un envoi massif est déjà en cours, lancé par " . $cfg::config{last_sender} . ", reste " . $outbox_sms_queue->pending() . ", annulation"]);

         return;

     }

-    $cfg::config{last_sender} = $request->{phone_owner};

-    my @results = sql_request("SELECT phone, firstname, gender FROM " . $cfg::config{table} . " WHERE " . $cfg::config{group_prefix} . $request->{table} . " > '0'");

+    $cfg::config{last_sender} = $msg->{PhoneOwner};

+    my @results = sql_request("SELECT phone, firstname, gender FROM " . $cfg::config{table} . " WHERE " . $cfg::config{group_prefix} . $msg->{groupe} . " > '0'");

     my $qty = scalar(@results);

     my $start_msg = "envoi de " . $qty . " SMS (fin prévue entre ". strftime("%H:%M", localtime(time() + $qty * 60)) . " et " . strftime("%H:%M", localtime(time() + $qty * 90)) . ")";

-    $to_gtalksms_queue->enqueue([$request->{phone}, $start_msg]);

+    $outbox_sms_queue->enqueue([$msg->{Phone}, $start_msg]);

     foreach my $contact (@results) {

         $contact->{phone} =~ s/[\s\.]//g;

-        $_ = $request->{body};

+        $_ = $msg->{Content};

         s/\@prénom/$contact->{firstname}/g;

         if ($contact->{gender} eq 'F') {

             s/\@\(\s*(\w+)\s*,\s*\w+\s*\)/$1/g;

@@ -206,64 +108,21 @@ sub massive_send_sms {

         else {

             s/\@\(\s*\w+\s*,\s*(\w+)\s*\)/$1/g;

         }

-        $to_gtalksms_queue->enqueue([$contact->{phone}, $_])

+        $outbox_sms_queue->enqueue([$contact->{phone}, $_])

     }

-    $to_gtalksms_queue->enqueue([$request->{phone}, "envoi des SMS terminé !"]);

+    $outbox_sms_queue->enqueue([$msg->{Phone}, "envoi des SMS terminé !"]);

 }

-sub control_sms_flow {

-    my ($body, $max, $interval) = @_;

-    my $flow_control="/home/sms/flow.control";

-#    use bytes; # les caractères UTF-8 peuvent être codés sur plus d'un octet

-#    my $nbr = ceil(length($$body)/140); # taille d'un SMS 140 octets

-     my $nbr = 1;

-#    no bytes;

-    while (1) {

-        my $left = $max;

-        my $t = time;

-        open (FILE, "<", $flow_control);

-        my @lines = <FILE>;

-        close FILE;

-        open(FILE, ">", $flow_control);

-        foreach my $line (@lines) {

-            $line =~ /(\d+)/;

-            my $ts = $1;

-            if ($ts + $interval > $t) {

-                $left--;

-                print FILE $line;

-            }

-        }

-        close FILE;

-        log_bot("  ---> to send: $nbr; left: $left");

-        last if $nbr < $left;

-        sleep 60;

-    }

-    open (FILE,">>", $flow_control);

-    for (my $i = 0; $i < $nbr; $i++) { print FILE time, "\n"; }

-    close FILE;

-}

+sub send_mail {

+    while (my $msg = $mail_queue->dequeue) {

+        defined($msg->{to}) or $msg->{to} = $cfg::config{mail};

+        open(MAIL, "|msmtp $msg->{to}");

+        print MAIL "Subject: $msg->{Subject}\n";

+        print MAIL "Reply-To: $msg->{Email}\n" if ($msg->{Email} ne '');

-sub xmpp_send {

-    my $msg = shift;

-    $bot->MessageSend(

-            to => $cfg::config{xmpp}->{phoneBuddy}, 

-            from => $cfg::config{xmpp}->{userName} . "@" . $cfg::config{xmpp}->{hostName}, 

-            resource => $cfg::config{xmpp}->{resource}, 

-            type => 'chat', 

-            body => $$msg

-    );

-}

-

-sub ssmtp_send_mail {

-    while (my $request = $mail_queue->dequeue) {

-        defined($request->{to}) or $request->{to} = $cfg::config{mail};

-        open(MAIL, "|/usr/lib/sendmail -t");

-        print MAIL "Subject: $request->{subject}\n"; 

-        print MAIL "To: $request->{to}\n";

-        print MAIL "Reply-To: $request->{email}\n" if ($request->{email} ne '');

-        print MAIL "$request->{body}\n";

+        print MAIL "$msg->{Content}\n";

         close(MAIL);

-        log_bot("mail envoyé à $request->{to}");

+        log_bot("mail envoyé à $msg->{to}");

     }

 }

@@ -275,27 +134,38 @@ sub wait_open_time ($$) {

     }

 }

-sub xmpp_send_sms {

-    while (my $ref = $to_gtalksms_queue->dequeue) {

+sub hilink_send_sms {

+    my $sendbox = HiPi::Huawei::E3531->new();

+    while (1) {

+        my $sms = $outbox_sms_queue->dequeue_timed(10, 1);

+        next if ! defined $sms;

         wait_open_time($cfg::config{close_hour}, $cfg::config{begin_hour}); # pas d'envoi entre 21h et 8h

-#        TODO lock($next_sms);

-#        TODO $next_sms = $$ref[0];

-        xmpp_send(\"sms:$$ref[0]:$$ref[1]");

-        log_bot("envoi à $$ref[0] : $$ref[1]");

-        sleep 60 + int(rand(30)); # en attendant la maîtrise de cond_wait et cond_signal: cond_signal() called on unlocked variable at ./bot line 348

-#        TODO cond_wait($next_sms); # attend le top 

+

+        if ($sendbox->{code}) {

+            log_bot('sendbox new: ' . HiPi::Huawei::Errors->get_error_message($sendbox->{code}));

+        }

+        else {

+            my $reponse = $sendbox->send_sms($$sms[0], , $$sms[1]);

+            if ($reponse->{code}) {

+                log_bot('send_sms: ' . HiPi::Huawei::Errors->get_error_message($reponse->{code}));

+            }

+

+            log_bot("envoi à $$sms[0] : $$sms[1]");

+        }

+        sleep 60 + int(rand(30));

     }

+    log_bot('fin du thread outbox_sms');

 }

 sub is_authorized {

-    my ($request) = @_;

-    my @results = sql_request("SELECT * FROM $cfg::config{table} WHERE phone = '$request->{phone}'");

+    my ($msg) = @_;

+    my @results = sql_request("SELECT * FROM $cfg::config{table} WHERE phone = '$msg->{Phone}'");

     if (scalar(@results) == 1) {

         my $_results = $results[0];

         foreach my $column (keys(%$_results)) {

             if ($column =~ /^$cfg::config{group_prefix}/) {

                 if ($results[0]->{$column} == 2) {

-                    $request->{address} = $results[0]->{address};

+                    $msg->{address} = $results[0]->{address};

                     return 1; # true

                 }

             }

@@ -308,21 +178,21 @@ sub is_authorized {

 }

 sub authorized_on_table {

-    my %request = @_;

-    my $table_name = $cfg::config{group_prefix} . $request{groupe};

-    my @results = sql_request("SELECT * FROM $cfg::config{table} WHERE phone = '$request{id}'");

+    my %msg = @_;

+    my $table_name = $cfg::config{group_prefix} . $msg{groupe};

+    my @results = sql_request("SELECT * FROM $cfg::config{table} WHERE phone = '$msg{id}'");

     if (scalar(@results) == 1) {

         if (! defined($results[0]->{$table_name})) {

-            $request{error} = "le groupe $request{groupe} n'existe pas";

-            $to_gtalksms_queue->insert(0, [$request{id}, $request{error}]);

+            $msg{error} = "le groupe $msg{groupe} n'existe pas";

+            $outbox_sms_queue->insert(0, [$msg{id}, $msg{error}]);

             return 0; # false

         }

     }

-    @results = sql_request("SELECT $table_name FROM $cfg::config{table} WHERE phone = '$request{id}'");

+    @results = sql_request("SELECT $table_name FROM $cfg::config{table} WHERE phone = '$msg{id}'");

     if (scalar(@results) == 1) {

         if ($results[0]->{$table_name} != 2) {

-            $request{error} = "désolé, écrire au groupe $request{groupe} n'est pas autorisé pour toi";

-            $to_gtalksms_queue->insert(0, [$request{id}, $request{error}]);

+            $msg{error} = "désolé, écrire au groupe $msg{groupe} n'est pas autorisé pour toi";

+            $outbox_sms_queue->insert(0, [$msg{id}, $msg{error}]);

             return 0; # false

         }

         else {

@@ -332,10 +202,10 @@ sub authorized_on_table {

 }

 sub react_on_message {

-    my ($hashref , $request) = @_;

+    my ($hashref , $msg) = @_;

     for my $regex (keys(%$hashref)) {

-        if ($request->{body} =~ m/$regex/i) {

-            $request->{body} =~ s/$regex//i;

+        if ($msg->{Content} =~ m/$regex/i) {

+            $msg->{Content} =~ s/$regex//i;

             $hashref->{$regex}();

             return 1; # true

         }

@@ -343,166 +213,126 @@ sub react_on_message {

     return 0; # false

 }

-sub messageCB {

-    my ($sid, $msg) = @_;

-    $from_gtalksms_queue->enqueue($msg) if $msg->DefinedBody();

-}

-

-sub from_gtalksms_parse {

-    while (my $msg = $from_gtalksms_queue->dequeue) {

-        my %request = (body => $msg->GetBody);

-        my %part_from_gtalksms = (

-            $cfg::gtalksms{from} => sub { # Message de +33612345678 :

-                $request{phone} = "0" . $1;

-                $request{phone_owner} = '';

-                $request{email} = '';

-                my @results = sql_request("SELECT * FROM " . $cfg::config{table} . " WHERE phone = '$request{phone}'");

-                my $number_of_candidates = @results;

-                $number_of_candidates == 0 and return;

-                $request{phone_owner} .= '(';

-                foreach (@results) {

-                    $request{phone_owner} .= "$_->{firstname} $_->{lastname}";

-                    --$number_of_candidates > 0 and $request{phone_owner} .= ' ou ';

-                    $request{email} = $_->{email};

-                } 

-                $request{phone_owner} .= ')';

-                log_bot("message de $request{phone} $request{phone_owner}");

-            },

-            $cfg::gtalksms{"delivered"} => sub { # SMS "un contenu de SMS" pour 0612345678 délivré.

-                log_bot("message $1 délivré pour $2");

-# TODO cond_signal($next_sms);

-            },

-            $cfg::gtalksms{forget} => sub { # Le destinataire par défaut est 0612345678: inutile

-                return;

-            },

-        );

-

-        my %sms_action = (

-            "create flag" => sub {

-                my ($flag) = @_;

-                my $gid = getgrnam("sms-action");

-                mkdir $cfg::sms_action{flagdir};

-                chmod 0770, $cfg::sms_action{flagdir};

-                chown $>, $gid, $cfg::sms_action{flagdir};

-

-                open(FLAG, ">" . $cfg::sms_action{flagdir} . "/" . $cfg::sms_action{flag});

-                chmod 0660, $cfg::sms_action{flagdir} . "/" . $cfg::sms_action{flag};

-                chown $>, $gid, $cfg::sms_action{flagdir} . "/" . $cfg::sms_action{flag};

-

-                print FLAG $$flag if defined $flag;

-                close FLAG;

-            },

-            "start action" => sub {

-                # 0 = false

-                return ! system("sudo /bin/systemctl start action.service");

-            },

-            "get locker" => sub {

-                open FLAG, $cfg::sms_action{flagdir} . "/" . $cfg::sms_action{flag};

-                my $locker = '';

-                my $intro_ = '';

-                while (<FLAG>) {

-                    if (/^firstname:(.+)$/) {

-                        $locker = " par " . $1;

-                    }

-                    if (/^intro:(.+)$/) {

-                        $intro_ = " de test ($1)";

-                    }

-                }

-                close FLAG;

-                return "l'envoi " . $intro_ . " est déjà prévu" . $locker . ", abandon";

-            },

-        );

+sub inbox_sms_parse {

+    while (my $msg = $inbox_sms_queue->dequeue) {

         my %part_from_user = (

-            $cfg::user{"stop"} => sub {

-                log_bot("arrêt demandé par $request{phone} $request{phone_owner}");

-                $bot->Disconnect();

-            },

             $cfg::user{"message de groupe"} => sub {

-                $request{table} = lc $1;

-                if (authorized_on_table(groupe => $request{table}, id => $request{phone})) {

-                    &massive_send_sms(\%request);

+                $msg->{groupe} = lc $1;

+                if (authorized_on_table(groupe => $msg->{groupe}, id => $msg->{Phone})) {

+                    &massive_send_sms(\%$msg);

                 }

             },

             $cfg::user{"message pour un destinataire"} => sub {

-                $to_gtalksms_queue->enqueue([$1, $2]);

+                $outbox_sms_queue->enqueue([$1, $msg->{Content}]);

             },

             $cfg::user{"ping"} => sub {

-                my $envoi_en_cours = "";

-                if ($to_gtalksms_queue->pending() > 0) {

-                    $envoi_en_cours = "\nenvoi en cours de traitement " . $cfg::config{last_sender};

-                }

-                log_bot("envoi d'un pong à $request{phone} $request{phone_owner}");

-                $to_gtalksms_queue->insert(0, [$request{phone}, "pong ($phone_status)" . $envoi_en_cours]);

-            },

-            $cfg::user{"test intro pour action"} => sub {

-                my $intro = $1;

-                if (! -r $cfg::sms_action{flag_prefix} . $intro . $cfg::sms_action{flag_suffix}) {

-                    $to_gtalksms_queue->enqueue([$request{phone}, "l'intro $intro n'existe pas, abandon"]);

-                    return;

-                }

-                if (-r $cfg::sms_action{flagdir} . "/" . $cfg::sms_action{flag}) {

-                    $to_gtalksms_queue->enqueue([$request{phone}, $sms_action{"get locker"}()]);

-                }

-                else {

-                    log_bot("demande envoi du mail des actions avec intro $intro depuis $request{phone} $request{phone_owner} à $request{address}");

-                    my $flag_content = "to:" . $request{address} . "\nintro:" . $intro . "\nfirstname:" . $request{phone} . " " . $request{phone_owner};

-                    $sms_action{"create flag"}(\$flag_content);

-                    if ($sms_action{"start action"}()) {

-                        $to_gtalksms_queue->enqueue([$request{phone}, "le mail de test des actions avec intro $intro envoyé à $request{address}"]);

-                    }

-                    else {

-                        $to_gtalksms_queue->enqueue([$request{phone}, "problème: le mail de test des actions avec intro $intro pour $request{address}, n'est probablement pas parti"]);

-                    }

-                }

-            },

-            $cfg::user{"envoi normal pour action"} => sub {

-                if (-r $cfg::sms_action{flagdir} . "/" . $cfg::sms_action{flag}) {

-                    $to_gtalksms_queue->enqueue([$request{phone}, $sms_action{"get locker"}()]);

-                }

-                else {

-                    log_bot("demande envoi du mail des actions depuis $request{phone} $request{phone_owner}");

-                    $sms_action{"create flag"}();

-                    if ($sms_action{"start action"}()) {

-                        $to_gtalksms_queue->enqueue([$request{phone}, "le mail des actions est parti"]);

-                    }

-                    else {

-                        $to_gtalksms_queue->enqueue([$request{phone}, "problème: le mail des actions n'est probablement pas parti"]);

+                my $envoi_en_cours = '';

+                if ($outbox_sms_queue->pending() > 0) {

+                    for (my $queue_id = $outbox_sms_queue->pending(); $queue_id >= 0; $queue_id--) {

+                        log_bot(Dumper($outbox_sms_queue->peek($queue_id)));

                     }

+                    $envoi_en_cours = "\nenvoi en cours de traitement (reste " . $outbox_sms_queue->pending() . ") ";

+                    $envoi_en_cours .= "par $cfg::config{last_sender}" if defined($cfg::config{last_sender});

                 }

+                log_bot("envoi d'un pong à $msg->{Phone} $msg->{PhoneOwner} $envoi_en_cours");

+                $outbox_sms_queue->insert(0, [$msg->{Phone}, "pong" . $envoi_en_cours]);

             },

         );

-        if (react_on_message(\%part_from_gtalksms, \%request)) {

-            if (defined $request{phone} and !(is_authorized(\%request) and react_on_message(\%part_from_user, \%request))) {

-                $request{subject} = "SMS recu de $request{phone} $request{phone_owner}";

-                $mail_queue->enqueue(\%request);

-            }

+        $msg->{Phone} =~ s/^\+33/0/;

+        $msg->{Email} = '';

+

+        my @results = sql_request("SELECT * FROM " . $cfg::config{table} . " WHERE phone = '$msg->{Phone}'");

+        my $number_of_candidates = @results;

+        $number_of_candidates == 0 and return;

+        $msg->{PhoneOwner} = '(';

+        foreach (@results) {

+            $msg->{PhoneOwner} .= "$_->{firstname} $_->{lastname}";

+            --$number_of_candidates > 0 and $msg->{PhoneOwner} .= ' ou ';

+            $msg->{Email} = $_->{email};

         }

-        else {

-            log_bot("message de type inconnu: $request{body}") unless $request{body} eq "";

+        $msg->{PhoneOwner} .= ')';

+        $msg->{Subject} = "SMS recu de $msg->{Phone} $msg->{PhoneOwner}";

+

+        if (defined $msg->{Phone} and !(is_authorized(\%$msg) and react_on_message(\%part_from_user, \%$msg))) {

+            log_bot("message de $msg->{Phone} $msg->{PhoneOwner}");

+            $mail_queue->enqueue(\%$msg);

         }

-        undef %request;

+        undef $msg;

     }

 }

-$from_gtalksms->detach; # gère la file des événements produits par GTalkSMS

-$to_gtalksms->detach;   # gère la file des envois de SMS par GTalkSMS

-$mail->detach;          # gère la file des mails

-$bot->SetMessageCallBacks(message => \&messageCB);

+$inbox_sms->detach;    # gère la file des événements produits par GTalkSMS

+log_bot("inbox thread ok");

+$outbox_sms->detach;   # gère la file des envois de SMS par GTalkSMS

+log_bot("outbox thread ok");

+$mail->detach;         # gère la file des mails

+log_bot("mail thread ok");

-$bot->PresenceSend();

-my $roster = $bot->Roster;

-$roster->add($cfg::config{xmpp}->{phoneBuddy});

+my $loop = 0;

+log_bot("robot prêt");

+while ( 1 ) {

-while(defined($bot->Process())) { 

-    $bot->RosterGet();

-    my $status = $roster->query($cfg::config{xmpp}->{phoneBuddy},'resources');

-    if ($status) {

-        $phone_status = $status->{GTalkSMS}->{status} =~ s/^GTalkSMS - //r;

+    $loop++;

+

+    my $notifications = $hlink->check_notifications();

+    if ($notifications->{code}) {

+        log_bot('check_notifications: ' . HiPi::Huawei::Errors->get_error_message($notifications->{code}));

     }

-    else {

-        $phone_status = "";

+#TODO    elsif ($notifications->{OnlineUpdateStatus} != 10) {

+#TODO        trouver les significations

+#TODO    }

+    elsif ($notifications->{UnreadMessage}) {

+        my $inbox = $hlink->get_inbox();

+        if ($inbox->{code}) {

+            log_bot('get_inbox: ' . HiPi::Huawei::Errors->get_error_message($inbox->{code}));

+        }

+        elsif (defined $inbox->{Count} and $inbox->{Count} > 0) {

+#            log_bot($inbox->{Count} . " messages dans inbox");

+            for (my $i = 0; $i < $inbox->{Count}; $i++) {

+#                log_bot("id " . $inbox->{Messages}[$i]->{Index} . ", status: " . $inbox->{Messages}[$i]->{Smstat});

+                if ($inbox->{Messages}[$i]->{Smstat}) { # message lu

+                    my $delete = $hlink->delete_sms($inbox->{Messages}[$i]->{Index});

+                    if ($delete->{code}) {

+                        log_bot('delete_sms: ' . HiPi::Huawei::Errors->get_error_message($delete->{code}));

+                    }

+#                    log_bot("id " . $inbox->{Messages}[$i]->{Index} . " deleted");

+                }

+                else {

+                    $inbox_sms_queue->enqueue($inbox->{Messages}[$i]);

+#                    log_bot("id " . $inbox->{Messages}[$i]->{Index} . " enqueued");

+                    my $read = $hlink->set_sms_read($inbox->{Messages}[$i]->{Index});

+                    if ($read->{code}) {

+                        log_bot('set_sms_read: ' . HiPi::Huawei::Errors->get_error_message($read->{code}));

+                    }

+#                    log_bot("id " . $inbox->{Messages}[$i]->{Index} . " marked as read") if defined $inbox->{Messages}[$i]->{Index};

+                }

+            }

+        }

+    }

+

+#on vérifie toutes les 30 secondes

+    sleep 30;

+    log_bot('outbox_sms not running') unless ($outbox_sms->is_running());

+    next if ($loop % 20);

+    $loop = 0;

+

+# nettoyage des envoyés toutes les 10 minutes

+    my $outbox = $hlink->get_outbox();

+    if ($outbox->{code}) {

+        log_bot('get_outbox: ' . HiPi::Huawei::Errors->get_error_message($outbox->{code}));

+    }

+    elsif (defined $outbox->{Count} and $outbox->{Count} > 1) {

+#        log_bot($outbox->{Count} . " messages dans outbox");

+# on conserve le dernier envoyé

+        for (my $i = 1; $i < $outbox->{Count}; $i++) {

+            my $delete = $hlink->delete_sms($outbox->{Messages}[$i]->{Index});

+            if ($delete->{code}) {

+                log_bot('delete_sms: ' . HiPi::Huawei::Errors->get_error_message($delete->{code}));

+            }

+#            log_bot("id " . $outbox->{Messages}[$i]->{Index} . " deleted");

+        }

     }

 }

@@ -5,49 +5,20 @@ use open ':std';

 use utf8;

 %config = (

-    xmpp => {

-        hostName => '192.168.xxx.xxx', # @IP serveur XMPP

-        portNumber => 5222, # port XMPP (en général 5222)

-        componentName => '192.168.xxx.xxx', # @IP serveur sms

-        userName => 'xxxxxxx', # user XMPP

-        passWord => 'xxxxxxx', # password de l'utilisateur

-        resource => 'xxxxxxx', # une ressource (cf RFC XMPP)

-        tls => 1,

-        connectionType => 'tcpip',

-        phoneBuddy => 'xxxxx@192.168.xxx.xxx', # le contact GTalkSMS sur XMPP (utilisateur@IP_serveur_XMPP)

-    },

-    db => {

-        driver => "DBI:mysql:database=xxxxx;host=xxxxxx", # database: le nom de la bdd, host: l'hôte de la bdd, type: le type de bdd (sqlite, mysql, ...) 

-        user => "xxxxxxx", # utilisateur de la base de donnée

-        password => "xxxxxxx", # son mot de passe

-    },

-    DEBUG => 0,

-    VERBOSE => 0,

-    mail => 'xxxxxxx@xxxxxxx.xxx', # pour l'envoi des mails

+        db => { # config du connecteur

+            driver => "DBI:XXXXX:database=XXXXX;host=XXXXXXXXX",

+            user => "XXXXXX",

+            password => "XXXXXXXXXX",

+        },

+        table => 'XXXXXXXX', # le nom de la table qui contient les infos

+        group_prefix => 'XXXXXXXXX', # le préfixe des colonnes de groupes

+        close_hour => 'XX', # mise en pause des envois de SMS à XX heures

+        begin_hour => 'XX', # reprise des envois de SMS à XX heures

+        mail => 'XXXXXXXX@XXXXXXXXXXXX', # envoi de mails (avec msmtp) à cette adresse

 );

-# spécifique pour la liaison avec l'appli action

-%sms_action = (

-    flag_prefix => '/var/www/owncloud/data/xxxxxxxxxx/files/xxxxxx',

-    flag_suffix => '.html',

-    flagdir => '/xxxx/xxxxxx',

-    flag => 'xxxxxx',

-);

-

-%gtalksms = (

-     "from"         => '^Message\s+de\s+\+33([67]\d{8})\s+:\W*',

-     "delivered"    => '^SMS "(.+)" pour (0\d{9}) délivré\.$',

-     "forget"       => '^Le destinataire par défaut est (\+33|0)\d{9}$',

- 

-);

-

-%user = (

-    "stop"                            => '^\s*stoppe le bousin\s*$',

-    "message de groupe"               => '^\s*envoi\s+[aà]\s+(\w+)\s*:\W*',

-    "message pour un destinataire"    => '^\s*sms\s+pour\s+(0\d{9})\s*:(.+)$',

-    "copie d'une base"                => '^\s*copie\s+(\w+)\s+en\s+(\w+)(.*)$',

-    "ajout d'une entrée dans un base" => '^\s*ajoute\s+dans\+(\w+)\s*:\n',

-    "ping"                            => '^\s*ping\s*$',

-    "test intro pour action"          => '^\s*test\s+intro\s+(\w+)\s*$',

-    "envoi normal pour action"        => '^\s*action\s*$',

+%user = ( # chaque clé correspond à une expression régulière qui sera testée sur le SMS reçu

+        "message de groupe"               => '^\s*envoi\s+[aà]\s+(\w+)\s*:\W*',

+        "message pour un destinataire"    => '^\s*sms\s+pour\s+(0\d{9})\s*:\W*',

+        "ping"                            => '^\s*ping\s*$',

 );