+ прием запроса от кролика notify.abonbot.send

abonbot.pl

@@ -26,6 +26,8 @@ use FindBin qw/$Bin/;
 use lib "$Bin/lib";
 use lib "$Bin/modules";
 
+use rabbit_async_rec;
+
 use darsan_auth;
 use darsan_client;
 use rabbit_async_rec;
@@ -35,6 +37,7 @@ use abon_client;
 use localization;
 
 my $NAME = "abonbot";
+
 my $confdir = app->home.'/config/'.app->mode;
 
 plugin yaml_config => {
@@ -67,6 +70,18 @@ our $client = darsan_client->new($auth, $config->{darsan}->{servers});
 $client->map($config->{darsan_map}) if $config->{darsan_map};
 
 our $redis = Redis->new(server => $config->{redis}, name=>"abonbot");
+$redis->client_setname($NAME);
+
+my $args = $config->{rabbit};
+$args->{product} = $NAME;
+
+my $rabbit; $rabbit = new rabbit_async_rec($args, sub
+{
+  foreach (@{$config->{listen}})
+  {
+    $rabbit->listen_queue($_->{queue}, $_->{bind}, \&incoming_message);
+  }
+});
 
 our $abon_client = abon_client->new;
 
@@ -199,6 +214,78 @@ sub secret_error($info, $str)
 
 ##################################
 
+sub incoming_message
+{
+  my $m = shift;
+
+  my $body = $m->{content};
+  $log->debug($m->{routing_key}." ".Dumper($m->{content})) if $config->{debug};
+
+  my $rk = $m->{routing_key};
+  $rk =~ s/\./_/g;
+  $rk =~ s/-/_/g;
+  my $sub = reference("rabbit::$rk");
+
+  unless ($sub)
+  {
+    $log->error("Unknown message: ".$m->{routing_key});
+    $rabbit->reject($m);
+    return;
+  }
+
+  my $res = eval { $sub->($body,$m) };
+
+  if ($@)
+  {
+    $log->error($m->{routing_key} . " " . Dumper($m->{content}) . " " . Dumper($@));
+    
+    my $err = $@;
+    
+    if (ref $err && ref $err eq "HASH")
+    {
+      $err->{error} = 1;
+    }
+    else
+    {
+      $err = {error=>1, text=>$@};
+    }
+    
+    $rabbit->reply($m, $err) if $m->{header}->{reply_to};
+    $rabbit->reject($m);
+  }
+  else
+  {
+    $rabbit->ack($m);
+    $log->debug("acknowledged") if $config->{debug};
+
+    if (ref $res && $res->can("then"))
+    {
+      $res->then(sub 
+      {
+        my $r = shift;
+        $rabbit->reply($m, $r) if $m->{header}->{reply_to};
+      }, sub 
+      {
+        my $err = shift;
+        my $rec = {error=>1, text=>$err};
+        $rabbit->reply($m, $rec) if $m->{header}->{reply_to};
+      });
+    }
+    else
+    {
+      # не обещание, обычный результат
+      $rabbit->reply($m, $res) if $m->{header}->{reply_to};
+    }
+  }
+}
+
+sub rabbit::notify_abonbot_send($body, $=)
+{
+  notify({id=>$body->{to}}, $body->{message});
+}
+
+##################################
+
 sub terminate
 {
   request("setWebhook", {url=>""})->then(sub
@@ -354,8 +441,7 @@ sub _loc($lang, $str)
 
 sub _($str)
 {
-  return $str; #!!!
-  return _loc($fsa->notes("lang") || "ru", $str);
+  return _loc($config->{locale} || "ru", $str);
 }
 
 sub parse_time 

modules/commands.pm

@@ -157,8 +157,8 @@ async sub callback_transfer
   my ($fsa, $info) = @_;
   my $uid = $fsa->note("uid");
   
-  my $to_uid = $fsa->note("xfer_to");
-  my $amount = $fsa->note("xfer_amount");
+  my $to_uid = $fsa->delete_note("xfer_to");
+  my $amount = $fsa->delete_note("xfer_amount");
   
   unless ($to_uid && $amount)
   {

modules/fsa.pm

@@ -56,7 +56,9 @@ async sub switch
   
   my $new_state = $rule->($self, $line, @rest);
   $new_state = await $new_state if ref $new_state && $new_state->can("then");
-  die "fsa::switch: unknown new state '$state'" unless exists $self->{rules}->{$new_state};
+  use Data::Dumper;
+  say Dumper $new_state;
+  die "fsa::switch: unknown new state '$new_state'" unless exists $self->{rules}->{$new_state};
 
   $self->note("_state", $new_state);
   $new_state;

modules/rules.pm

@@ -0,0 +1,202 @@
+use Modern::Perl;
+use Data::Dumper;
+use Mojo::Base -strict, -signatures, -async_await;
+use Mojo::Util;
+use Scalar::Util;
+
+use fsa;
+
+our $redis;
+our $config;
+our $client;
+our $commands;
+our $kb_menu;
+our $abon_client;
+
+##################################################
+
+my $rules = {
+  
+   logged_out => async sub
+   {
+     my ($fsa, $line, $info) = @_;
+   
+     if ($line ne "/start")
+     {
+       reply($info, _("Для начала работы наберите <b>/start</b>"));
+       return "logged_out";
+     }
+
+     # Поступила команда /start
+     
+     # У нас есть uid в автомате? Это значит, что мы прочитали состояние из внешней базы
+     return "command" if $fsa->note("uid");
+     
+     # Проверяем, логинился ли уже пользователь в нашем боте
+     my $res = eval { await $client->get_p("client", "/telegram/$info->{id}/client") };
+     if ($@)
+     {
+       if ($@->{code} == 410)
+       {
+         reply($info, 
+           _("Вас приветствует провайдер") . " " . $config->{provider},
+           _("Введите номер учетной записи или логин")
+         );
+         
+         return "needs_login";
+       }
+       else
+       {
+         die $@;
+       }
+     }
+
+     reply($info, greet($res->{fio}));
+     $fsa->note(uid => $res->{uid});
+     return "command";
+   },
+   
+   needs_login => sub($fsa, $line, $info)
+   {
+     $fsa->note(login => $line);
+     reply($info, _("Теперь введите пароль"));
+     "needs_password";
+   },
+
+   needs_password => async sub
+   {
+      my ($fsa, $line, $info) = @_;
+      
+      my $res = eval { await $client->post_p("client", "/telegram/client", {login=>$fsa->note("login"), password=>$line, telegram_id=>$info->{id}}) };
+      if ($@)
+      {
+        $fsa->state("logged_out");
+        $fsa->delete_note("login");
+        die $@;
+      }
+         
+      reply($info, greet($res->{fio}));
+      $fsa->note(uid => $res->{uid});
+      $fsa->delete_note("login");
+      
+      "command";
+   },  
+
+   command => async sub
+   {
+     my ($fsa, $line, $info) = @_;
+     await do_command($fsa, $line, $info);
+     
+     $fsa->state; # или все тот же command, или команда установила уже свое состояние
+   },
+   
+   #### Перевод денег
+   
+   xfer_needs_uid => async sub
+   {
+     my ($fsa, $target_uid, $info) = @_;
+     my $uid = $fsa->note("uid");
+     
+     $fsa->state("command"); # на случай die
+     
+     if ($uid==$target_uid)
+     {
+       reply($info, _("Нельзя перевести деньги себе самому"));
+       return "command";
+     }
+     
+     my $res = await $abon_client->get_p($info, "client", "/client/$target_uid");
+     
+     if ($res->{disabled})
+     {
+       reply($info, _("Абонент $target_uid отключен"));
+       return "command";
+     }
+     
+     my $nick = $res->{fio};
+     my @fio = split(/\s+/, $res->{fio});
+     if (@fio)
+     {
+       my $f = shift(@fio);
+       $nick = join(" ", (substr($f, 0, 1) . ".", @fio));
+     }
+     
+     reply(
+       $info, _("Получатель денег: ") .  $nick,
+       "Теперь введите сумму, которую хотите перевести",
+     );
+     
+     $fsa->note(xfer_to => $target_uid);
+     return "xfer_needs_amount";
+   }, 
+   
+   xfer_needs_amount => async sub
+   {
+     my ($fsa, $amount, $info) = @_;
+     my $uid = $fsa->note("uid");
+     my $to_uid = $fsa->note("xfer_to");
+     
+     $amount =~ s/,/./g;
+     $amount =~ s/[^\d\.]//g;
+     my $tmp = $amount;
+     my $count = $amount =~ tr/.//;
+
+     if (!$amount || $count>1)
+     {
+       reply($info, _("Вы ввели неправильную сумму"));
+       return "command";
+     }
+     
+     $fsa->note(xfer_amount => $amount);
+     reply_with($info, {
+         inline_menu => [[
+           { text=>_("Подтвердите перевод"), callback_data=>"\x00/transfer" },
+         ]]
+       },
+       sprintf("%.2f %s %s %d", $amount, $config->{currency}->{human}, _(" на счет абонента"), $to_uid),
+     );
+     
+     return "command";
+   },
+};
+
+sub greet($whom)
+{
+  my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+  my $greet = $hour>=4 && $hour<=10 ? _("Доброе утро") : $hour>10 && $hour<6 ? _("Добрый день") : _("Добрый вечер");
+
+  "$greet, $whom";
+}
+
+######################
+
+sub make_key($id)
+{
+  return "abonbot-$id";
+}
+
+sub save_fsa($fsa, $chatid)
+{
+  my $key = make_key($chatid);
+  say "saving state ", $fsa->state, Dumper $fsa->notes;
+
+  $redis->del($key);
+  $redis->hmset($key, %{ $fsa->notes });
+  $redis->expire($key, 3600*24);
+}
+
+sub make_fsa($chatid, $from)
+{
+  my $id = make_key($chatid);
+  my $notes = { $redis->hgetall($id) };
+  if (keys %$notes)
+  {
+    return fsa->new($rules, $notes->{_state}, $notes); 
+  }
+  else
+  {
+    return fsa->new($rules, "logged_out", {});
+  }
+}
+
+1;