fix autobackup

- cron status
- fix with sending a backup when there are special characters in the bot name

app/bot.php

@@ -1076,12 +1076,18 @@ class Bot
     public function checkBackup()
     {
         $c   = $this->getPacConf();
-        $now = strtotime(date('Y-m-d H:i'));
         if (!empty($c['backup'])) {
+            $now = strtotime(date('Y-m-d H:i:s'));
             [$start, $period] = explode('/', $c['backup']);
-            $start  = strtotime($start);
-            $period = strtotime($period, 0);
-            if ($now - $start >= $period && ($now - $start) % $period == 0) {
+            $start  = strtotime(trim($start));
+            $period = strtotime(trim($period), 0);
+            if (
+                !empty($start)
+                && !empty($period)
+                && empty($this->backup)
+                && $now - $start >= $period
+                && ($now - $start) % $period < 10
+            ) {
                 if (!empty($c['pinbackup'])) {
                     $this->pinAdmin($c['pinbackup'], 1);
                 }
@@ -1090,6 +1096,12 @@ class Bot
         }
     }
 
+    public function cleanQueue(): void
+    {
+        $r = $this->request('deleteWebhook', []);
+        $r = $this->request('getUpdates', ['offset' => -1]);
+    }
+
     public function pinAdmin($pin, $unpin = false)
     {
         require __DIR__ . '/config.php';
@@ -1104,9 +1116,8 @@ class Bot
     {
         require __DIR__ . '/config.php';
         $conf              = $this->getPacConf();
-        $bot               = $this->request('getMyName', [])['result']['name'];
+        $bot               = preg_replace('~[\W]~iu', '_', $this->request('getMyName', [])['result']['name']);
         $conf['pinbackup'] = $this->upload("{$bot}_export_" . date('d_m_Y_H_i') . '.json', $this->export(), $c['admin'][0])['result']['message_id'];
-        $conf['backup']    = implode(' / ', [date('Y-m-d H:i'), trim(explode('/', $conf['backup'])[1])]);
         $this->setPacConf($conf);
         $this->pinAdmin($conf['pinbackup']);
     }
@@ -1296,7 +1307,7 @@ class Bot
         if (!empty($file)) {
             file_put_contents($file, $json);
         }
-        $bot = $this->request('getMyName', [])['result']['name'];
+        $bot = preg_replace('~[\W]~iu', '_', $this->request('getMyName', [])['result']['name']);
         return $this->upload("{$bot}_export_" . date('d_m_Y_H_i') . '.json', $json);
     }
 
@@ -1316,7 +1327,7 @@ class Bot
         ];
     }
 
-    public function importFile($file = false)
+    public function importFile($file = false, $autoupdate = false)
     {
         if (!empty($file)) {
             $json = json_decode(file_get_contents($file), true);
@@ -1356,7 +1367,11 @@ class Bot
                 $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
                 $this->wg = 0;
                 $this->saveClients($json['wg']['clients']);
-                $this->restartWG($this->createConfig($json['wg']['server']), $switch_amnezia);
+                if (empty($autoupdate)) {
+                    $this->restartWG($this->createConfig($json['wg']['server']), $switch_amnezia);
+                } else {
+                    file_put_contents('/config/wg0.conf', $this->createConfig($json['wg']['server']));
+                }
                 $this->iptablesWG();
             }
             // wg1
@@ -1365,7 +1380,11 @@ class Bot
                 $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
                 $this->wg = 1;
                 $this->saveClients($json['wg1']['clients']);
-                $this->restartWG($this->createConfig($json['wg1']['server']), $switch_wg1amnezia);
+                if (empty($autoupdate)) {
+                    $this->restartWG($this->createConfig($json['wg1']['server']), $switch_wg1amnezia);
+                } else {
+                    file_put_contents('/config/wg1.conf', $this->createConfig($json['wg1']['server']));
+                }
                 $this->iptablesWG();
             }
             // ad
@@ -1448,8 +1467,10 @@ class Bot
             $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
             $this->language = $this->getPacConf()['language'] ?: 'en';
             $this->limit    = $this->getPacConf()['limitpage'] ?: 5;
-            sleep(3);
-            $this->menu();
+            if (empty($file)) {
+                sleep(3);
+                $this->menu();
+            }
         }
     }
 
@@ -1785,11 +1806,18 @@ class Bot
 
     public function sslip()
     {
-        $c = $this->getPacConf();
-        if (empty($c['domain'])) {
+        require __DIR__ . '/config.php';
+        $p  = $this->getPacConf();
+        $ip = getenv('IP');
+        $r  = $this->send($c['admin'][0], "start $ip");
+
+        $this->input['chat']       = $c['admin'][0];
+        $this->input['message_id'] = $r['result']['message_id'];
+        if (empty($p['domain'])) {
             $this->addDomain(str_replace('.', '-', $this->ip) . '.nip.io', 1);
             $this->setSSL('letsencrypt');
         }
+        $this->menu();
     }
 
     public function comment($text, $tag)
@@ -3843,9 +3871,10 @@ DNS-over-HTTPS with IP:
     public function menu($type = false, $arg = false, $return = false)
     {
         $domain = $this->getPacConf()['domain'] ?: $this->ip;
+        $cron   = exec('pgrep -f cron.php');
         $menu   = [
             'main' => [
-                'text' => 'v' . getenv('VER'),
+                'text' => 'v' . getenv('VER') . ($this->dontshowcron ? '' : "\ncron: " . $this->i18n($cron ? 'on' : 'off') . ($cron ? '' : ' show <code>logs/php_error</code>')),
                 'data' => [
                     [
                         [
@@ -5025,6 +5054,14 @@ DNS-over-HTTPS with IP:
             }
             $json['routing']['rules'] = array_values($json['routing']['rules']);
         }
+        if (!empty($json['route']['rules'])) {
+            foreach ($json['route']['rules'] as $k => $v) {
+                if (count($v) < 2) {
+                    unset($json['route']['rules'][$k]);
+                }
+            }
+            $json['route']['rules'] = array_values($json['route']['rules']);
+        }
         return json_encode($json);
     }
 
@@ -5565,7 +5602,11 @@ DNS-over-HTTPS with IP:
         ];
         $backup = array_filter(explode('/', $conf['backup']));
         if (!empty($backup)) {
-            $backup = "{$backup[0]} start / {$backup[1]} period";
+            if (!empty(strtotime($backup[0])) && !empty(strtotime($backup[1]))) {
+                $backup = "{$backup[0]} start / {$backup[1]} period";
+            } else {
+                $backup = $this->i18n('off') . " {$conf['backup']} - wrong format";
+            }
         }
         $data[] = [
             [
@@ -5712,32 +5753,21 @@ DNS-over-HTTPS with IP:
 
     public function selfUpdate()
     {
-        require __DIR__ . '/config.php';
-        if (!empty($c['admin'])) {
-            $ip = getenv('IP');
-            $rm = explode(':', trim(file_get_contents('/update/reload_message')));
-            $m  = file_get_contents('/update/message');
-            foreach ($c['admin'] as $k => $v) {
-                $r = $this->send($v, "start $ip");
-                $this->input['chat']        = $v;
-                $this->input['message_id']  = $r['result']['message_id'];
-                if (file_exists($this->update)) {
-                    if (!empty($m)) {
-                        $this->send($v, "<pre>$m</pre>", $v == $rm[0] ? $rm[1] : 0);
-                    }
-                    $r = $this->send($v, "import settings");
-                    $this->input['chat']        = $v;
-                    $this->input['message_id']  = $r['result']['message_id'];
-                    $this->input['callback_id'] = $r['result']['message_id'];
-                    if (empty($flag)) {
-                        $this->importFile($this->update);
-                        unlink($this->update);
-                        $flag = true;
-                    }
-                } else {
-                    $this->menu();
-                }
+        $ip                         = getenv('IP');
+        $rm                         = explode(':', trim(file_get_contents('/update/reload_message')));
+        $m                          = file_get_contents('/update/message');
+        $this->input['chat']        = $rm[0];
+        $this->input['message_id']  = $rm[1];
+        $this->input['callback_id'] = $rm[1];
+        if (file_exists($this->update)) {
+            if (!empty($m)) {
+                $this->send($this->input['chat'], "<pre>$m</pre>", $rm[1]);
             }
+            $r = $this->send($this->input['chat'], "import settings");
+            $this->input['message_id']  = $r['result']['message_id'];
+            $this->input['callback_id'] = $r['result']['message_id'];
+            $this->importFile($this->update, 1);
+            unlink($this->update);
         }
         file_put_contents('/update/message', '');
         file_put_contents('/update/reload_message', '');
@@ -5875,7 +5905,11 @@ DNS-over-HTTPS with IP:
             $c['backup'] = '';
         } else {
             [$start, $period] = explode('/', $text);
-            $c['backup'] = implode(' / ', [date('Y-m-d H:i', strtotime($start)), trim($period)]);
+            if (!empty(strtotime($start)) && !empty(strtotime($period))) {
+                $c['backup'] = implode(' / ', [date('Y-m-d H:i', strtotime($start)), trim($period)]);
+            } else {
+                $this->send($this->input['from'], $this->input['message'] . ' - wrong format');
+            }
         }
         if ($c['pinbackup']) {
             $this->pinAdmin($c['pinbackup'], 1);
@@ -5993,25 +6027,25 @@ DNS-over-HTTPS with IP:
 
     public function createConfig($data)
     {
+        $pac = $this->getPacConf();
         $conf[] = "[Interface]";
         if (empty($data['interface']['ListenPort'])) {
             if (empty($data['interface']['DNS'])) {
-                $data['interface']['DNS'] = $this->getPacConf()[$this->getInstanceWG(1) . 'dns'] ?: $this->dns;
+                $data['interface']['DNS'] = $pac[$this->getInstanceWG(1) . 'dns'] ?: $this->dns;
             }
             if (empty($data['interface']['MTU'])) {
-                $data['interface']['MTU'] = $this->getPacConf()[$this->getInstanceWG(1) . 'mtu'] ?: $this->mtu;
+                $data['interface']['MTU'] = $pac[$this->getInstanceWG(1) . 'mtu'] ?: $this->mtu;
             }
         }
         foreach ($data['interface'] as $k => $v) {
             $conf[] = "$k = $v";
         }
-        $pac = $this->getPacConf();
         if (!empty($data['peers'])) {
             foreach ($data['peers'] as $peer) {
                 $conf[] = '';
                 $conf[] = $peer['# PublicKey'] ? '# [Peer]' : '[Peer]';
                 if (!empty($peer['Endpoint'])) {
-                    $peer['Endpoint'] = ($this->getPacConf()[$this->getInstanceWG(1) . 'endpoint'] ? $this->ip : $this->getDomain()) . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
+                    $peer['Endpoint'] = ($pac[$this->getInstanceWG(1) . 'endpoint'] ? $this->ip : $this->getDomain()) . ":" . getenv($this->getInstanceWG(1) ? 'WG1PORT' : 'WGPORT');
                 }
                 foreach ($peer as $k => $v) {
                     $conf[] = "$k = $v";

app/init.php

@@ -10,6 +10,7 @@ if ($c['debug']) {
 }
 
 $bot = new Bot($c['key'], $i);
+$bot->cleanQueue();
 $bot->setwebhook();
 $bot->selfUpdate();
 $bot->adguardCheckPswd();

app/service.php

@@ -13,5 +13,6 @@ if ($c['debug']) {
 $bot = new Bot($c['key'], $i);
 
 $bot->restartTG();
+$bot->dontshowcron = 1;
 $bot->sslip();
 $bot->cleanDocker();

config/ocserv.conf

@@ -180,7 +180,7 @@ server-key = /certs/cert_private
 # the isolation was tested at. If you get random failures on worker processes, try
 # disabling that option and report the failures you, along with system and debugging
 # information at: https://gitlab.com/openconnect/ocserv/issues
-isolate-workers = true
+isolate-workers = false
 
 # A banner to be displayed on clients after connection
 #banner = "Welcome"

docker-compose.yml

@@ -462,11 +462,6 @@ services:
             default:
                 ipv4_address: 10.10.0.11
         logging: *default-logging
-        deploy:
-            resources:
-                limits:
-                    cpus: '0.50'
-                    memory: 200M
     np:
         image: mercurykd/vpnbot-np:1.1
         build:

makefile

@@ -1,9 +1,10 @@
 b:
 	docker compose build
 u: # запуск контейнеров
+	$(eval IP := $(shell curl -s -t 1 2ip.io || curl -s -t 1 ipinfo.io/ip || curl -s -t 1 ifconfig.me))
 	bash ./update/update.sh &
 	touch ./override.env
-	IP=$(shell curl ipinfo.io/ip) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
+	IP=$(IP) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
 d: # остановка контейнеров
 	-kill -9 $(shell cat ./update/update_pid) > /dev/null
 	docker compose down --remove-orphans

version

@@ -1,3 +1,23 @@
+23.10.2024 v1.82
+- фикс автобэкапа
+23.10.2024 v1.81
+- фикс краша wireguard после апдейта
+23.10.2024 v1.80
+- фикс пустых правил для singbox
+23.10.2024 v1.79
+- улучшение процесса обновления
+23.10.2024 v1.78
+- фикс двойного импорта при обновлении, когда админов больше одного
+- рестарт бота сбрасывает очередь сообщений от телеграма
+- при старте статус крона не показывается, т.к он еще не успел запуститься
+23.10.2024 v1.77
+- вывод статуса cron
+- фикс с отправкой бэкапа при спецсимволах в названии бота
+- проверка формата времени в автобэкапе
+22.10.2024 v1.76
+- улучшение определения ip бота при старте
+22.10.2024 v1.75
+- openconnect: isolate-workers = false
 21.10.2024 v1.74
 - openconnect: expose-iroutes on/off
 21.10.2024 v1.73