added wss tools 6

This commit is contained in:
2026-06-18 19:32:28 +03:30
parent dc440abf61
commit 017ab348c7
12 changed files with 133 additions and 90 deletions
@@ -214,10 +214,16 @@ class WalletController extends Controller
$this->validateWithdrawAmount((int) $data['value']);
$extraNote = trim((string) ($data['extra_note'] ?? ''));
if (strlen($extraNote) > 500) {
return response()->json(['message' => 'توضیحات اضافی حداکثر ۵۰۰ کاراکتر است'], 422);
}
$Withdraw = Withdraw::create([
'customer_id' => auth('customer')->id(),
"cash" => $data['value'],
"note" => "برداشت ریالی",
'extra_note' => $extraNote !== '' ? $extraNote : null,
"bank_account_id" => $data['card_id'],
'sts' => 1,
'type' => 2
@@ -18,9 +18,7 @@ class PriceStreamController extends Controller
abort(404);
}
$host = $service->resolveHost($request);
return response()->stream(function () use ($service, $host) {
return response()->stream(function () use ($service) {
@set_time_limit(0);
if (function_exists('apache_setenv')) {
@@ -46,15 +44,13 @@ class PriceStreamController extends Controller
$send('last', $last);
}
$lastId = $host !== '' ? $service->currentSeq($host) : 0;
$lastId = $service->currentSeq();
$heartbeatTicks = 0;
while (! connection_aborted()) {
if ($host !== '') {
foreach ($service->consumeSince($host, $lastId) as $event) {
$send((string) $event['event'], $event['data']);
$lastId = (int) $event['id'];
}
foreach ($service->consumeSince($lastId) as $event) {
$send((string) $event['event'], $event['data']);
$lastId = (int) $event['id'];
}
$heartbeatTicks++;
@@ -22,7 +22,6 @@ use Illuminate\Support\Facades\Mail;
use Morilog\Jalali\Jalalian;
use App\Services\ConfigService;
use App\Services\LivePriceCacheService;
use App\Services\PriceBroadcastService;
use App\Services\ProductDisplayPriceService;
@@ -133,10 +132,7 @@ class ReportController extends Controller
$cache = app(LivePriceCacheService::class);
$cache->markTick();
$result = $cache->put($payload);
app(PriceBroadcastService::class)->broadcastAfterPriceUpdate($result, true);
return $result;
return $cache->put($payload);
}
return $payload;
+1
View File
@@ -16,6 +16,7 @@ class Withdraw extends Model
'cash',
'gold',
'note',
'extra_note',
'tracked_number',
'bank_account_id',
'date_at',
+2
View File
@@ -40,6 +40,8 @@ class LivePriceCacheService
app(ProductDisplayPriceService::class)->cacheLivePricePayload($body);
app(PriceBroadcastService::class)->broadcastLastIfChanged($body);
return $body;
}
+2 -1
View File
@@ -84,7 +84,8 @@ class LivePriceTickService
app(LivePriceCacheService::class)->markTick();
app(PriceBroadcastService::class)->broadcastAfterPriceUpdate($payload);
// last از put داخل lastPrice؛ list بعد از sync محصولات
app(PriceBroadcastService::class)->broadcastListIfChanged();
} finally {
$lock->release();
}
+44 -6
View File
@@ -45,17 +45,55 @@ class PriceBroadcastService
$lastChanged = is_array($lastPayload) && $lastPayload !== []
&& $this->rememberHashIfChanged(self::LAST_HASH_KEY, $lastPayload);
$listPayload = $this->buildProductListPayload();
$listChanged = $listPayload !== null
&& $this->rememberHashIfChanged(self::LIST_HASH_KEY, $listPayload);
$this->publishListIfChanged();
if ($lastChanged) {
if ($lastChanged && is_array($lastPayload)) {
$stream->publish('last', $lastPayload);
}
}
if ($listChanged) {
$stream->publish('list', $listPayload);
public function broadcastLastIfChanged(?array $lastPayload): void
{
$stream = app(PriceStreamService::class);
if (! $stream->isEnabled()) {
return;
}
if (! is_array($lastPayload) || $lastPayload === []) {
return;
}
if (! $this->rememberHashIfChanged(self::LAST_HASH_KEY, $lastPayload)) {
return;
}
$stream->publish('last', $lastPayload);
}
public function broadcastListIfChanged(): bool
{
$stream = app(PriceStreamService::class);
if (! $stream->isEnabled()) {
return false;
}
return $this->publishListIfChanged();
}
private function publishListIfChanged(): bool
{
$listPayload = $this->buildProductListPayload();
if ($listPayload === null) {
return false;
}
if (! $this->rememberHashIfChanged(self::LIST_HASH_KEY, $listPayload)) {
return false;
}
app(PriceStreamService::class)->publish('list', $listPayload);
return true;
}
/**
+8 -13
View File
@@ -68,9 +68,9 @@ class PriceStreamService
return '';
}
public function currentSeq(string $host): int
public function currentSeq(): int
{
$inbox = Cache::get($this->inboxKey($host), ['seq' => 0, 'events' => []]);
$inbox = Cache::get($this->inboxKey(), ['seq' => 0, 'events' => []]);
return (int) ($inbox['seq'] ?? 0);
}
@@ -78,9 +78,9 @@ class PriceStreamService
/**
* @return array<int, array{id: int, event: string, data: mixed}>
*/
public function consumeSince(string $host, int $afterId): array
public function consumeSince(int $afterId): array
{
$inbox = Cache::get($this->inboxKey($host), ['seq' => 0, 'events' => []]);
$inbox = Cache::get($this->inboxKey(), ['seq' => 0, 'events' => []]);
$events = is_array($inbox['events'] ?? null) ? $inbox['events'] : [];
return array_values(array_filter(
@@ -92,18 +92,13 @@ class PriceStreamService
/**
* @param array<string, mixed>|array<int, mixed> $data
*/
public function publish(string $event, array $data, ?string $host = null): void
public function publish(string $event, array $data): void
{
if (! $this->isEnabled()) {
return;
}
$host = $host ?? $this->resolveHost();
if ($host === '') {
return;
}
$key = $this->inboxKey($host);
$key = $this->inboxKey();
$inbox = Cache::get($key, ['seq' => 0, 'events' => []]);
$inbox['seq'] = (int) ($inbox['seq'] ?? 0) + 1;
$inbox['events'][] = [
@@ -119,9 +114,9 @@ class PriceStreamService
Cache::put($key, $inbox, now()->addSeconds(self::INBOX_TTL_SECONDS));
}
private function inboxKey(string $host): string
private function inboxKey(): string
{
return self::INBOX_PREFIX.$this->normalizeHost($host);
return self::INBOX_PREFIX.'global';
}
private function normalizeHost(string $host): string
+8
View File
@@ -77,6 +77,10 @@ class ProductPriceSyncService
app(PriceSyncLogService::class)->record($source, $sourceUrl, $liquidGoldPrice, $logItems);
if ($synced) {
app(PriceBroadcastService::class)->broadcastListIfChanged();
}
return $synced;
}
@@ -101,6 +105,10 @@ class ProductPriceSyncService
$synced = true;
}
if ($synced) {
app(PriceBroadcastService::class)->broadcastListIfChanged();
}
return $synced;
}
@@ -0,0 +1,34 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
if (! Schema::hasTable('withdraws')) {
return;
}
if (Schema::hasColumn('withdraws', 'extra_note')) {
return;
}
Schema::table('withdraws', function (Blueprint $table) {
$table->text('extra_note')->nullable()->after('note');
});
}
public function down(): void
{
if (! Schema::hasTable('withdraws') || ! Schema::hasColumn('withdraws', 'extra_note')) {
return;
}
Schema::table('withdraws', function (Blueprint $table) {
$table->dropColumn('extra_note');
});
}
};
+12
View File
@@ -226,6 +226,18 @@ PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
SET @sql = IF(
(SELECT COUNT(*) FROM information_schema.TABLES
WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'withdraws') > 0
AND (SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'withdraws' AND COLUMN_NAME = 'extra_note') = 0,
'ALTER TABLE `withdraws` ADD COLUMN `extra_note` TEXT NULL DEFAULT NULL AFTER `note`',
'SELECT ''skip withdraws.extra_note'' AS info'
);
PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
SET @sql = IF(
(SELECT COUNT(*) FROM information_schema.TABLES
WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'withdraws') > 0
+10 -56
View File
@@ -205,7 +205,7 @@ INSERT INTO `settings` (`key`, `value`, `title_fa`, `can_edit`, `is_active`, `de
SELECT 'external_order_api_enabled', 'true', 'فعال‌سازی API سفارش خارجی (get_wallet / order)', 1, 1, 'true + node_client_id + node_shared_secret'
WHERE NOT EXISTS (SELECT 1 FROM `settings` WHERE `key` = 'external_order_api_enabled' LIMIT 1);
-- WebSocket قیمت (SSE — last/list از لاراول)
-- SSE قیمت (last/list از لاراول)
INSERT INTO `settings` (`key`, `value`, `title_fa`, `can_edit`, `is_active`, `description`, `type`)
SELECT 'wss_enabled', 'true', 'قیمت لحظه‌ای (SSE)', 0, 1, 'روشن: اپ به sse_path وصل می‌شود؛ خاموش: polling /api/price/last و /customer/product/list', 'switch'
WHERE NOT EXISTS (SELECT 1 FROM `settings` WHERE `key` = 'wss_enabled' LIMIT 1);
@@ -214,30 +214,6 @@ INSERT INTO `settings` (`key`, `value`, `title_fa`, `can_edit`, `is_active`, `de
SELECT 'sse_path', '/api/price/stream', 'مسیر SSE قیمت', 0, 1, 'GET لاراول — استریم event:last و event:list با payload کامل', 'text'
WHERE NOT EXISTS (SELECT 1 FROM `settings` WHERE `key` = 'sse_path' LIMIT 1);
INSERT INTO `settings` (`key`, `value`, `title_fa`, `can_edit`, `is_active`, `description`, `type`)
SELECT 'wss_path', '/prc/ws', 'مسیر WebSocket (منسوخ)', 0, 0, 'منسوخ — از sse_path استفاده کنید', 'text'
WHERE NOT EXISTS (SELECT 1 FROM `settings` WHERE `key` = 'wss_path' LIMIT 1);
INSERT INTO `settings` (`key`, `value`, `title_fa`, `can_edit`, `is_active`, `description`, `type`)
SELECT 'wss_trigger_host', '127.0.0.1', 'هاست trigger وب‌سوکت', 0, 1, 'هاست داخلی برای POST لاراول — معمولاً 127.0.0.1 (همان سرور docker ws)', 'text'
WHERE NOT EXISTS (SELECT 1 FROM `settings` WHERE `key` = 'wss_trigger_host' LIMIT 1);
INSERT INTO `settings` (`key`, `value`, `title_fa`, `can_edit`, `is_active`, `description`, `type`)
SELECT 'wss_http_port', '', 'پورت HTTP trigger وب‌سوکت', 0, 1, 'پورت host برای container:3000 — لاراول: http://{wss_trigger_host}:{این_پورت}{wss_trigger_path}. لایت‌اسپید External App /prc. مثال طباطبایی: 2012', 'number'
WHERE NOT EXISTS (SELECT 1 FROM `settings` WHERE `key` = 'wss_http_port' LIMIT 1);
INSERT INTO `settings` (`key`, `value`, `title_fa`, `can_edit`, `is_active`, `description`, `type`)
SELECT 'wss_socket_port', '', 'پورت WebSocket (مرجع دیپلوی)', 0, 1, 'مرجع docker WS_SOCKET_PORT و لایت‌اسپید /prc/ws — کد PHP/فرانت نمی‌خواند. container:8080. مثال طباطبایی: 2011', 'number'
WHERE NOT EXISTS (SELECT 1 FROM `settings` WHERE `key` = 'wss_socket_port' LIMIT 1);
INSERT INTO `settings` (`key`, `value`, `title_fa`, `can_edit`, `is_active`, `description`, `type`)
SELECT 'wss_link', '', 'آدرس trigger وب‌سوکت (منسوخ)', 0, 0, 'منسوخ — خالی بماند. از wss_trigger_host + wss_http_port استفاده کنید.', 'text'
WHERE NOT EXISTS (SELECT 1 FROM `settings` WHERE `key` = 'wss_link' LIMIT 1);
INSERT INTO `settings` (`key`, `value`, `title_fa`, `can_edit`, `is_active`, `description`, `type`)
SELECT 'wss_trigger_path', '/prc/api/trigger-update', 'مسیر trigger برادکست', 0, 1, 'مسیر POST لاراول برای برادکست last/list — پیش‌فرض /prc/api/trigger-update', 'text'
WHERE NOT EXISTS (SELECT 1 FROM `settings` WHERE `key` = 'wss_trigger_path' LIMIT 1);
INSERT INTO `settings` (`key`, `value`, `title_fa`, `can_edit`, `is_active`, `description`, `type`)
SELECT 'montify_name', '', 'نام فروشگاه در درگاه', 1, 1, NULL, 'text'
WHERE NOT EXISTS (SELECT 1 FROM `settings` WHERE `key` = 'montify_name' LIMIT 1);
@@ -568,24 +544,6 @@ WHERE `key` = 'wss_enabled';
UPDATE `settings` SET `title_fa` = COALESCE(NULLIF(TRIM(`title_fa`), ''), 'مسیر SSE قیمت')
WHERE `key` = 'sse_path';
UPDATE `settings` SET `title_fa` = COALESCE(NULLIF(TRIM(`title_fa`), ''), 'مسیر WebSocket (منسوخ)')
WHERE `key` = 'wss_path';
UPDATE `settings` SET `title_fa` = COALESCE(NULLIF(TRIM(`title_fa`), ''), 'هاست trigger وب‌سوکت')
WHERE `key` = 'wss_trigger_host';
UPDATE `settings` SET `title_fa` = COALESCE(NULLIF(TRIM(`title_fa`), ''), 'پورت HTTP trigger وب‌سوکت')
WHERE `key` = 'wss_http_port';
UPDATE `settings` SET `title_fa` = COALESCE(NULLIF(TRIM(`title_fa`), ''), 'پورت WebSocket (مرجع دیپلوی)')
WHERE `key` = 'wss_socket_port';
UPDATE `settings` SET `title_fa` = COALESCE(NULLIF(TRIM(`title_fa`), ''), 'آدرس trigger وب‌سوکت (منسوخ)')
WHERE `key` = 'wss_link';
UPDATE `settings` SET `title_fa` = COALESCE(NULLIF(TRIM(`title_fa`), ''), 'مسیر trigger برادکست')
WHERE `key` = 'wss_trigger_path';
UPDATE `settings` SET `title_fa` = COALESCE(NULLIF(TRIM(`title_fa`), ''), 'بسته بودن همکار')
WHERE `key` = 'montzar_closed';
@@ -663,7 +621,6 @@ UPDATE `settings` SET `type` = 'number' WHERE `key` IN (
'min_withdraw', 'min_first_buy', 'minimum_sell',
'montzar_product_id', 'gift_for_referrer',
'gift_for_referral', 'up_price', 'down_price', 'payping_fin_customer_id', 'tahesab_port',
'wss_http_port', 'wss_socket_port',
'deposit_sms_support_number'
);
@@ -677,7 +634,7 @@ UPDATE `settings` SET `type` = 'text' WHERE `key` IN (
'payping_start_url', 'payping_verify_url', 'payping_gateway_items', 'payping_fin_url',
'payping_fin_token', 'payping_gateway_item', 'tahesab_host', 'tahesab_token', 'tahesab_db',
'node_client_id', 'node_shared_secret',
'wss_path', 'sse_path', 'wss_trigger_host', 'wss_link', 'wss_trigger_path',
'sse_path',
'tahesab_bank_account', 'telegram_bot_token', 'bale_bot_token', 'support_messenger_id', 'referral_limit',
'referral_bonus_amount', 'balance_report_exclude_customer_id', 'metal_type', 'montify_name', 'price_extreme_date',
'default_vc_number', 'liman_token'
@@ -913,14 +870,17 @@ UPDATE `settings` SET `can_edit` = 0 WHERE `key` = 'metal_type';
-- fee_cash legacy — فقط از دیپلوی/SQL
UPDATE `settings` SET `can_edit` = 0 WHERE `key` = 'fee_cash';
-- WebSocket — فقط دیپلوی/SQL (docker / لایت‌اسپید / ws/.env)
-- SSE قیمت — فقط دیپلوی/SQL
UPDATE `settings` SET `can_edit` = 0 WHERE `key` IN (
'wss_enabled', 'sse_path', 'wss_path', 'wss_trigger_host', 'wss_http_port', 'wss_socket_port',
'wss_link', 'wss_trigger_path', 'tahesab_port'
'wss_enabled', 'sse_path', 'tahesab_port'
);
-- wss_link منسوخ — مقدار قدیمی پاک شود
UPDATE `settings` SET `value` = '', `is_active` = 0 WHERE `key` = 'wss_link';
-- montzar/ws منسوخ — روی پروژه‌های قدیمی غیرفعال شود
UPDATE `settings` SET `value` = '', `is_active` = 0, `can_edit` = 0
WHERE `key` IN (
'wss_path', 'wss_trigger_host', 'wss_http_port', 'wss_socket_port',
'wss_link', 'wss_trigger_path'
);
-- لوگو / PWA / favicon — فقط از دیپلوی؛ در پنل نمایش داده نمی‌شوند
UPDATE `settings` SET `can_edit` = 0, `is_active` = 0
@@ -1028,12 +988,6 @@ UPDATE `settings` SET `description` = 'کلید مشترک امضای HMAC بر
UPDATE `settings` SET `description` = 'روشن: API دریافت کیف پول و ثبت سفارش از سرویس فروشگاه خارجی فعال است. نیاز به node_client_id و node_shared_secret دارد.' WHERE `key` = 'external_order_api_enabled';
UPDATE `settings` SET `description` = 'روشن: اپ به SSE (sse_path) وصل می‌شود و last/list با payload می‌آید؛ خاموش: polling.' WHERE `key` = 'wss_enabled';
UPDATE `settings` SET `description` = 'مسیر GET لاراول برای استریم قیمت — پیش‌فرض /api/price/stream' WHERE `key` = 'sse_path';
UPDATE `settings` SET `description` = 'منسوخ — montzar. از sse_path استفاده کنید.', `is_active` = 0 WHERE `key` = 'wss_path';
UPDATE `settings` SET `description` = 'هاست داخلی برای trigger لاراول — معمولاً 127.0.0.1. آدرس نهایی: http://{این_هاست}:{wss_http_port}{wss_trigger_path}' WHERE `key` = 'wss_trigger_host';
UPDATE `settings` SET `description` = 'پورت host برای HTTP سرویس ws (container:3000). لاراول POST برادکست. لایت‌اسپید External App /prc. هر پروژه پورت جدا — مثال طباطبایی: 2012' WHERE `key` = 'wss_http_port';
UPDATE `settings` SET `description` = 'مرجع دیپلوی: پورت host برای WebSocket (container:8080). لایت‌اسپید /prc/ws و WS_SOCKET_PORT در ws/.env. کد PHP/فرانت نمی‌خواند — مثال طباطبایی: 2011' WHERE `key` = 'wss_socket_port';
UPDATE `settings` SET `description` = 'منسوخ — خالی بماند. از wss_trigger_host + wss_http_port + wss_trigger_path استفاده کنید.', `value` = '', `is_active` = 0 WHERE `key` = 'wss_link';
UPDATE `settings` SET `description` = 'مسیر POST لاراول برای برادکست last/list به سرویس ws — پیش‌فرض: /prc/api/trigger-update' WHERE `key` = 'wss_trigger_path';
UPDATE `settings` SET `description` = 'نام فروشگاه که در درگاه پرداخت و رسید بانکی به کاربر نمایش داده می‌شود.' WHERE `key` = 'montify_name';
UPDATE `settings` SET `description` = 'روشن: پس از واریز/برداشت، تراکنش به سامانه حسابداری fin همگام‌سازی می‌شود.' WHERE `key` = 'payping_fin_sync_enabled';