This commit is contained in:
2025-08-14 21:51:09 +03:00
parent d522cbef83
commit 79c82c5109
20 changed files with 365 additions and 56 deletions

View File

@@ -1,5 +1,17 @@
<?php
use Bastion\ApplicationFactory;
$sysLibPath = rtrim(DIR_SYSTEM, '/') . '/library/oc_telegram_shop';
$basePath = rtrim(DIR_APPLICATION, '/') . '/..';
if (is_readable($sysLibPath . '/oc_telegram_shop.phar')) {
require_once "phar://{$sysLibPath}/oc_telegram_shop.phar/vendor/autoload.php";
} elseif (is_dir("$basePath/oc_telegram_shop")) {
require_once "$basePath/oc_telegram_shop/vendor/autoload.php";
} else {
throw new RuntimeException('Unable to locate application directory.');
}
/**
* @property Document $document
* @property Loader $load
@@ -163,6 +175,25 @@ class ControllerExtensionModuleTgshop extends Controller
$this->response->setOutput($this->load->view('extension/module/tgshop_init', $data));
}
public function handle(): void
{
$app = ApplicationFactory::create([
'base_url' => HTTPS_SERVER,
'public_url' => HTTPS_CATALOG,
'telegram' => [
'bot_token' => $this->config->get('module_tgshop_bot_token'),
'chat_id' => $this->config->get('module_tgshop_chat_id'),
'owner_notification_template' => $this->config->get('module_tgshop_owner_notification_template'),
'customer_notification_template' => $this->config->get('module_tgshop_customer_notification_template'),
],
'logs' => [
'path' => DIR_LOGS,
],
]);
$app->bootAndHandleRequest();
}
protected function validate(): bool
{
if (! $this->user->hasPermission('modify', 'extension/module/tgshop')) {

View File

@@ -167,35 +167,23 @@
return;
}
fetch(`https://api.telegram.org/bot${telegramToken}/getUpdates`)
.then(res => res.json())
.then(data => {
if (!data.ok || !data.result.length) {
alert('Не удалось получить обновления от бота. Убедитесь, что вы написали боту нужное кодовое слово.');
return;
fetch('/admin/index.php?route=extension/module/tgshop/handle&api_action=getChatId&user_token={{ user_token }}')
.then(async (res) => {
const data = await res.json().catch(() => null);
if (!res.ok) {
throw new Error(`Ошибка ${res.status}: ${data.message || res.statusText}`);
}
// Ищем последнее сообщение с chat_id
const lastMessage = data.result.reverse().find(update => update.message && update.message.chat);
if (!lastMessage) {
alert('Не найдено сообщений с chat_id.');
return;
}
if (lastMessage.message.text !== 'opencart_get_chatid') {
alert('Ошибка. Последнее сообщение у бота не содержит правильного кодового слова.');
return;
}
const chatId = lastMessage.message.chat.id;
$('#{{ settingKey }}').val(chatId); // подставляем в поле
alert('ChatID успешно получен и подставлен в поле.')
$('#{{ settingKey }}').val(data.data.chat_id);
alert('ChatID успешно получен и подставлен в поле.');
})
.catch(err => {
console.error(err);
alert('Ошибка при получении chat_id. Проверьте токен и соединение.');
alert(err);
});
});
</script>
</div>

View File

@@ -17,7 +17,7 @@ if (is_readable($sysLibPath . '/oc_telegram_shop.phar')) {
} elseif (is_dir("$basePath/oc_telegram_shop")) {
require_once "$basePath/oc_telegram_shop/vendor/autoload.php";
} else {
throw new RuntimeException('Unable to locate bulk products directory.');
throw new RuntimeException('Unable to locate application directory.');
}
/**
@@ -52,6 +52,7 @@ class Controllerextensiontgshophandle extends Controller
'theme_dark' => $this->config->get('module_tgshop_theme_dark'),
'mainpage_products' => $this->config->get('module_tgshop_mainpage_products'),
'featured_products' => $this->config->get('module_tgshop_featured_products'),
'base_url' => HTTPS_SERVER,
'ya_metrika_enabled' => ! empty(trim($this->config->get('module_tgshop_yandex_metrika'))),
'telegram' => [
'bot_token' => $this->config->get('module_tgshop_bot_token'),

View File

@@ -0,0 +1,32 @@
<?php
declare(strict_types=1);
namespace Bastion;
use App\ServiceProviders\AppServiceProvider;
use Openguru\OpenCartFramework\Application;
use Openguru\OpenCartFramework\Cache\CacheServiceProvider;
use Openguru\OpenCartFramework\QueryBuilder\QueryBuilderServiceProvider;
use Openguru\OpenCartFramework\Router\RouteServiceProvider;
use Openguru\OpenCartFramework\Support\Arr;
use Openguru\OpenCartFramework\Telegram\TelegramServiceProvider;
class ApplicationFactory
{
public static function create(array $config): Application
{
$defaultConfig = require __DIR__ . '/config.php';
$routes = require __DIR__ . '/routes.php';
return (new Application(Arr::mergeArraysRecursively($defaultConfig, $config)))
->withRoutes(fn () => $routes)
->withServiceProviders([
QueryBuilderServiceProvider::class,
RouteServiceProvider::class,
AppServiceProvider::class,
CacheServiceProvider::class,
TelegramServiceProvider::class,
]);
}
}

View File

@@ -0,0 +1,111 @@
<?php
namespace Bastion\Handlers;
use Exception;
use Openguru\OpenCartFramework\Cache\CacheInterface;
use Openguru\OpenCartFramework\Config\Settings;
use Openguru\OpenCartFramework\Http\JsonResponse;
use Openguru\OpenCartFramework\Http\Response;
use Openguru\OpenCartFramework\Logger\Logger;
use Openguru\OpenCartFramework\Router\Router;
use Openguru\OpenCartFramework\Support\Arr;
use Openguru\OpenCartFramework\Telegram\TelegramService;
use RuntimeException;
class TelegramHandler
{
private TelegramService $telegramService;
private Logger $logger;
private Router $router;
private Settings $settings;
private CacheInterface $cache;
public function __construct(
TelegramService $telegramService,
Logger $logger,
Router $router,
Settings $settings,
CacheInterface $cache
) {
$this->telegramService = $telegramService;
$this->logger = $logger;
$this->router = $router;
$this->settings = $settings;
$this->cache = $cache;
}
public function getMe(): JsonResponse
{
$data = $this->telegramService->exec('getMe');
return new JsonResponse($data);
}
public function setWebhook(): JsonResponse
{
$publicUrl = $this->settings->get('public_url');
if (! $publicUrl || $publicUrl === '/' || str_contains($publicUrl, 'localhost')) {
throw new RuntimeException('public_url is required in settings to create webhook.');
}
$webHookUrl = trim($publicUrl, '/') . $this->router->url('webhook');
try {
$data = $this->telegramService->exec('setWebhook', [
'url' => $webHookUrl,
]);
return new JsonResponse($data);
} catch (Exception $exception) {
return new JsonResponse(['error' => $exception->getMessage()], 500);
}
}
public function getWebhookInfo(): JsonResponse
{
try {
$data = $this->telegramService->exec('getWebhookInfo');
return new JsonResponse($data);
} catch (Exception $exception) {
return new JsonResponse(['error' => $exception->getMessage()], 500);
}
}
public function deleteWebhook(): JsonResponse
{
try {
$data = $this->telegramService->exec('deleteWebhook');
return new JsonResponse($data);
} catch (Exception $exception) {
return new JsonResponse(['error' => $exception->getMessage()], 500);
}
}
public function getChatId(): JsonResponse
{
$message = $this->cache->get('tg_latest_msg');
if (! $message) {
return new JsonResponse([
'message' => 'Сообщение не найдено. Убедитесь что отправили кодовое слово в чат с ботом и повторите через 10 секунд.'
], Response::HTTP_UNPROCESSABLE_ENTITY);
}
$chatId = Arr::get($message, 'chat.id');
if (! $chatId) {
return new JsonResponse([
'message' => 'ChatID не найден. Убедитесь что отправили кодовое слово в чат с ботом и повторите через 10 секунд.'
], Response::HTTP_UNPROCESSABLE_ENTITY);
}
return new JsonResponse([
'data' => [
'chat_id' => $chatId,
],
]);
}
}

View File

@@ -0,0 +1,20 @@
<?php
return [
'config_timezone' => 'UTC',
'lang' => 'en-gb',
'language_id' => 1,
'auth_user_id' => 0,
'base_url' => '/',
'db' => [
'host' => 'localhost',
'database' => 'not_set',
'username' => 'not_set',
'password' => 'not_set',
],
'logs' => [
'path' => 'not_set',
],
];

View File

@@ -0,0 +1,11 @@
<?php
use Bastion\Handlers\TelegramHandler;
return [
'getMe' => [TelegramHandler::class, 'getMe'],
'setWebhook' => [TelegramHandler::class, 'setWebhook'],
'getWebhookInfo' => [TelegramHandler::class, 'getWebhookInfo'],
'deleteWebhook' => [TelegramHandler::class, 'deleteWebhook'],
'getChatId' => [TelegramHandler::class, 'getChatId'],
];

View File

@@ -4,6 +4,7 @@
"psr-4": {
"Openguru\\OpenCartFramework\\": "framework/",
"App\\": "src/",
"Bastion\\": "bastion/",
"Tests\\": "tests/"
},
"files": [

View File

@@ -20,6 +20,8 @@ class Application extends Container
private static array $events = [];
private array $serviceProviders = [];
private array $middlewareStack = [];
private array $routes = [];
private LoggerInterface $logger;
public function __construct(array $config)
@@ -146,4 +148,16 @@ class Application extends Container
return $this;
}
public function withRoutes(callable $callback): Application
{
$this->routes = $callback();
return $this;
}
public function getRoutes(): array
{
return $this->routes;
}
}

View File

@@ -2,20 +2,14 @@
namespace Openguru\OpenCartFramework\Cache;
use Openguru\OpenCartFramework\Config\Settings;
use Openguru\OpenCartFramework\Container\Container;
use Openguru\OpenCartFramework\Container\ServiceProvider;
use Openguru\OpenCartFramework\QueryBuilder\Connections\ConnectionInterface;
class CacheServiceProvider extends ServiceProvider
{
public function register(): void
{
$this->container->singleton(CacheInterface::class, function (Container $container) {
return new DatabaseCache(
$container->get(ConnectionInterface::class),
$container->get(Settings::class)->get('tables.cache'),
);
$this->container->singleton(CacheInterface::class, function () {
return new SymfonyFilesystemCache('app.cache', 0, DIR_CACHE);
});
}
}
}

View File

@@ -0,0 +1,44 @@
<?php
namespace Openguru\OpenCartFramework\Cache;
use Symfony\Component\Cache\Adapter\FilesystemAdapter;
class SymfonyFilesystemCache implements CacheInterface
{
private FilesystemAdapter $cache;
public function __construct(string $namespace = 'app.cache', int $defaultLifetime = 0, ?string $cacheDir = null)
{
$this->cache = new FilesystemAdapter($namespace, $defaultLifetime, $cacheDir);
}
public function get(string $key)
{
$item = $this->cache->getItem($key);
return $item->isHit() ? $item->get() : null;
}
public function set(string $key, $value, ?int $ttlSeconds = null): void
{
$item = $this->cache->getItem($key);
$item->set($value);
if ($ttlSeconds) {
$item->expiresAfter($ttlSeconds);
}
$this->cache->save($item);
}
public function delete(string $key): void
{
$this->cache->deleteItem($key);
}
public function clear(): void
{
$this->cache->clear();
}
}

View File

@@ -2,6 +2,7 @@
namespace Openguru\OpenCartFramework\Router;
use Openguru\OpenCartFramework\Application;
use Openguru\OpenCartFramework\Container\Container;
use Openguru\OpenCartFramework\Container\ServiceProvider;
@@ -10,7 +11,9 @@ class RouteServiceProvider extends ServiceProvider
public function register(): void
{
$this->container->singleton(Router::class, function (Container $container) {
return new Router();
$routes = Application::getInstance()->getRoutes();
return new Router($routes);
});
}
}

View File

@@ -0,0 +1,14 @@
<?php
namespace Openguru\OpenCartFramework\Telegram;
use Exception;
use Throwable;
class TelegramClientException extends Exception
{
public function __construct($message, $code = 0, Throwable $previous = null)
{
parent::__construct($message, $code, $previous);
}
}

View File

@@ -3,6 +3,8 @@
namespace Openguru\OpenCartFramework\Telegram;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Exception\GuzzleException;
class TelegramService
{
@@ -62,4 +64,37 @@ class TelegramService
return $this;
}
/**
* Command used to exec telegram api methods
* @see https://core.telegram.org/bots/api
*
* @throws GuzzleException
* @throws TelegramClientException
* @throws \JsonException
*/
public function exec(string $methodName, array $params = []): array
{
if (! $this->botToken) {
throw new TelegramClientException('BotToken is empty');
}
try {
$response = $this->client->post($methodName, [
'json' => $params,
]);
$json = json_decode($response->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
return $json;
} catch (ClientException $exception) {
$response = $exception->getResponse()->getBody()->getContents();
$decoded = json_decode($response, true, 512, JSON_THROW_ON_ERROR);
throw new TelegramClientException(
$decoded['description'] ?? $exception->getMessage(),
$decoded['code'] ?? $exception->getCode(),
);
}
}
}

View File

@@ -11,6 +11,7 @@ class TelegramValidateInitDataMiddleware
private array $excluded = [
'testTgMessage',
'manifest',
'webhook',
];
public function __construct(SignatureValidator $signatureValidator)

View File

@@ -17,8 +17,10 @@ class ApplicationFactory
public static function create(array $config): Application
{
$defaultConfig = require __DIR__ . '/config.php';
$routes = require __DIR__ . '/routes.php';
return (new Application(Arr::mergeArraysRecursively($defaultConfig, $config)))
->withRoutes(fn () => $routes)
->withServiceProviders([
QueryBuilderServiceProvider::class,
CacheServiceProvider::class,

View File

@@ -0,0 +1,27 @@
<?php
namespace App\Handlers;
use Openguru\OpenCartFramework\Cache\CacheInterface;
use Openguru\OpenCartFramework\Http\JsonResponse;
use Openguru\OpenCartFramework\Http\Request;
use Openguru\OpenCartFramework\Support\Arr;
class TelegramHandler
{
private CacheInterface $cache;
public function __construct(CacheInterface $cache)
{
$this->cache = $cache;
}
public function webhook(Request $request): JsonResponse
{
$message = Arr::get($request->json(), 'message', []);
$this->cache->set('tg_latest_msg', $message, 60);
return new JsonResponse([]);
}
}

View File

@@ -5,13 +5,11 @@ namespace App\ServiceProviders;
use App\Exceptions\CustomExceptionHandler;
use Openguru\OpenCartFramework\Container\ServiceProvider;
use Openguru\OpenCartFramework\Contracts\ExceptionHandlerInterface;
use Openguru\OpenCartFramework\Router\Router;
class AppServiceProvider extends ServiceProvider
{
public function register(): void
{
$this->container->get(Router::class)->loadRoutesFromFile(__DIR__ . '/../routes.php');
$this->container->singleton(ExceptionHandlerInterface::class, function () {
return new CustomExceptionHandler();
});

View File

@@ -2,32 +2,11 @@
return [
'config_timezone' => 'UTC',
'lang' => 'en-gb',
'language_id' => 1,
'auth_user_id' => 0,
'base_url' => 'http://localhost',
'search_cache_seconds' => 60,
'chunk_size' => 100,
'retry_count' => 3,
'activity_log_retention_limit' => 5000,
'tables' => [
'selected_products' => 'bp_selected_products',
'simulation_results' => 'bp_simulation_results',
'activity_logs' => 'bp_activity_logs',
'cache' => 'bp_cache',
'task_progress' => 'bp_task_progress',
'task_steps' => 'bp_task_steps',
'search_results' => 'bp_search_results',
'settings' => 'bp_settings',
],
'db' => [
'host' => 'localhost',
'database' => 'not_set',

View File

@@ -5,6 +5,7 @@ use App\Handlers\CartHandler;
use App\Handlers\OrderHandler;
use App\Handlers\ProductsHandler;
use App\Handlers\SettingsHandler;
use App\Handlers\TelegramHandler;
return [
'products' => [ProductsHandler::class, 'handle'],
@@ -19,4 +20,6 @@ return [
'settings' => [SettingsHandler::class, 'index'],
'manifest' => [SettingsHandler::class, 'manifest'],
'testTgMessage' => [SettingsHandler::class, 'testTgMessage'],
'webhook' => [TelegramHandler::class, 'webhook'],
];