feat: implement version check and update dialog; add browser cache clearing functionality
Build and Deploy / build (push) Successful in 1m40s
Build and Deploy / build (push) Successful in 1m40s
This commit is contained in:
@@ -17,8 +17,8 @@ public partial class App
|
||||
{
|
||||
await base.OnInitializedAsync();
|
||||
|
||||
// Check app version and clear cache if needed
|
||||
await AppVersionService.CheckVersionAndClearCacheIfNeededAsync();
|
||||
// Check app version and show update dialog if needed
|
||||
await CheckAndShowVersionUpdateAsync();
|
||||
|
||||
// Check for referral code in URL query parameters
|
||||
var uri = Navigation.ToAbsoluteUri(Navigation.Uri);
|
||||
@@ -58,5 +58,77 @@ public partial class App
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// بررسی نسخه و نمایش دیالوگ آپدیت در صورت نیاز
|
||||
/// فقط برای کاربران لاگین شده
|
||||
/// </summary>
|
||||
private async Task CheckAndShowVersionUpdateAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
// فقط برای کاربران لاگین شده
|
||||
if (!await AuthService.IsAuthenticatedAsync())
|
||||
return;
|
||||
|
||||
// forDialog: true یعنی اگه skip کرده ولی یک روز گذشته، دوباره نشون بده
|
||||
var versionCheck = await AppVersionService.CheckVersionAsync(forDialog: true);
|
||||
|
||||
if (!versionCheck.HasNewVersion || string.IsNullOrEmpty(versionCheck.NewVersion))
|
||||
return;
|
||||
|
||||
// ثبت زمان نمایش دیالوگ
|
||||
await AppVersionService.RecordDialogShownAsync();
|
||||
|
||||
// تنظیمات دیالوگ
|
||||
var dialogOptions = new DialogOptions
|
||||
{
|
||||
BackdropClick = !versionCheck.IsForceUpdate, // اگر force باشه نتونه بیرون کلیک کنه
|
||||
CloseOnEscapeKey = !versionCheck.IsForceUpdate,
|
||||
CloseButton = !versionCheck.IsForceUpdate,
|
||||
MaxWidth = MaxWidth.Small,
|
||||
FullWidth = true
|
||||
};
|
||||
|
||||
var parameters = new DialogParameters<ReleaseNotesDialog>
|
||||
{
|
||||
{ x => x.OldVersion, versionCheck.OldVersion },
|
||||
{ x => x.NewVersion, versionCheck.NewVersion },
|
||||
{ x => x.ReleaseNotes, versionCheck.ReleaseNotes },
|
||||
{ x => x.UpdateMessage, versionCheck.UpdateMessage },
|
||||
{ x => x.IsForceUpdate, versionCheck.IsForceUpdate }
|
||||
};
|
||||
|
||||
var dialog = await DialogService.ShowAsync<ReleaseNotesDialog>("بروزرسانی", parameters, dialogOptions);
|
||||
var result = await dialog.Result;
|
||||
|
||||
if (result is { Canceled: false, Data: bool shouldUpdate })
|
||||
{
|
||||
if (shouldUpdate)
|
||||
{
|
||||
// کاربر خواست آپدیت کنه
|
||||
await AppVersionService.ApplyUpdateAsync(versionCheck.NewVersion);
|
||||
|
||||
// رفرش صفحه
|
||||
Navigation.NavigateTo(Navigation.Uri, forceLoad: true);
|
||||
}
|
||||
else
|
||||
{
|
||||
// کاربر گفت بعداً (فقط وقتی force نیست)
|
||||
await AppVersionService.SkipVersionAsync(versionCheck.NewVersion);
|
||||
}
|
||||
}
|
||||
else if (versionCheck.IsForceUpdate)
|
||||
{
|
||||
// اگر force بود و دیالوگ بسته شد، باز هم آپدیت کن
|
||||
await AppVersionService.ApplyUpdateAsync(versionCheck.NewVersion);
|
||||
Navigation.NavigateTo(Navigation.Uri, forceLoad: true);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// در صورت خطا، لاگ کن ولی ادامه بده
|
||||
Console.WriteLine($"Error checking version: {ex.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -106,6 +106,29 @@
|
||||
// اجرای اولیه (حتی اگر کاربر اسکرول نکرده)
|
||||
requestAnimationFrame(update);
|
||||
}
|
||||
|
||||
// پاک کردن کش مرورگر (Cache Storage و Service Worker)
|
||||
window.clearBrowserCache = async function() {
|
||||
// پاک کردن Cache Storage (Service Worker cache)
|
||||
if ('caches' in window) {
|
||||
const cacheNames = await caches.keys();
|
||||
await Promise.all(
|
||||
cacheNames.map(cacheName => caches.delete(cacheName))
|
||||
);
|
||||
console.log('Cache Storage cleared:', cacheNames.length, 'caches deleted');
|
||||
}
|
||||
|
||||
// پاک کردن Service Worker registration
|
||||
if ('serviceWorker' in navigator) {
|
||||
const registrations = await navigator.serviceWorker.getRegistrations();
|
||||
await Promise.all(
|
||||
registrations.map(registration => registration.unregister())
|
||||
);
|
||||
console.log('Service Workers unregistered:', registrations.length);
|
||||
}
|
||||
|
||||
return true;
|
||||
};
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -63,11 +63,32 @@
|
||||
@* </MudBadge> *@
|
||||
<MudIconButton Icon="@Icons.Material.Filled.ShoppingCart" Color="@(_cartCount > 0?Color.Success:Color.Inherit)"
|
||||
Href="@(RouteConstants.Store.Cart)" />
|
||||
@* دکمه بروزرسانی *@
|
||||
@if (_hasUpdate)
|
||||
{
|
||||
<MudBadge Dot="true" Color="Color.Error" Overlap="true" Bordered="true">
|
||||
<MudIconButton Icon="@Icons.Material.Filled.SystemUpdateAlt"
|
||||
Color="Color.Warning"
|
||||
OnClick="OpenUpdateDialog"
|
||||
Title="بروزرسانی موجود است"/>
|
||||
</MudBadge>
|
||||
}
|
||||
<MudMenu Icon="@Icons.Material.Filled.Person" Color="Color.Inherit" Size="Size.Medium">
|
||||
<MudMenuItem OnClick="NavigateToProfile" Disabled="@(!AuthService.IsCompleteRegister())">
|
||||
پروفایل
|
||||
</MudMenuItem>
|
||||
<MudDivider/>
|
||||
@if (_hasUpdate)
|
||||
{
|
||||
<MudMenuItem OnClick="OpenUpdateDialog" IconColor="Color.Warning" Icon="@Icons.Material.Filled.SystemUpdateAlt">
|
||||
<MudText Color="Color.Warning">بروزرسانی (@_newVersion)</MudText>
|
||||
</MudMenuItem>
|
||||
<MudDivider/>
|
||||
}
|
||||
<MudMenuItem OnClick="ToggleTheme" Icon="@(_isDark ? Icons.Material.Filled.LightMode : Icons.Material.Filled.DarkMode)">
|
||||
@(_isDark ? "حالت روشن" : "حالت تاریک")
|
||||
</MudMenuItem>
|
||||
<MudDivider/>
|
||||
<MudMenuItem OnClick="Logout">خروج از حساب</MudMenuItem>
|
||||
</MudMenu>
|
||||
}
|
||||
@@ -75,10 +96,10 @@
|
||||
{
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Login" Color="Color.Inherit"
|
||||
OnClick="OpenAuthDialog"/>
|
||||
<MudIconButton OnClick="@ToggleTheme"
|
||||
Icon="@(_isDark ? Icons.Material.Filled.LightMode : Icons.Material.Filled.DarkMode)"
|
||||
Title="@(_isDark ? "حالت روشن" : "حالت تاریک")"/>
|
||||
}
|
||||
|
||||
<MudIconButton OnClick="@ToggleTheme" Edge="Edge.End"
|
||||
Icon="@(_isDark ? Icons.Material.Filled.DarkMode : Icons.Material.Filled.LightMode)"/>
|
||||
</div>
|
||||
</MudContainer>
|
||||
</MudAppBar>
|
||||
@@ -114,6 +135,19 @@
|
||||
{
|
||||
<MudButton Href="/profile" Color="Color.Primary" OnClick="() => _drawerOpen=false">پروفایل
|
||||
</MudButton>
|
||||
@if (_hasUpdate)
|
||||
{
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Warning"
|
||||
StartIcon="@Icons.Material.Filled.SystemUpdateAlt"
|
||||
OnClick="() => { _drawerOpen=false; OpenUpdateDialog(); }">
|
||||
بروزرسانی (@_newVersion)
|
||||
</MudButton>
|
||||
}
|
||||
<MudButton Variant="Variant.Text"
|
||||
StartIcon="@(_isDark ? Icons.Material.Filled.LightMode : Icons.Material.Filled.DarkMode)"
|
||||
OnClick="ToggleTheme">
|
||||
@(_isDark ? "حالت روشن" : "حالت تاریک")
|
||||
</MudButton>
|
||||
<MudButton Variant="Variant.Text" Color="Color.Error"
|
||||
OnClick="() => { _drawerOpen=false; Logout(); }">خروج از حساب
|
||||
</MudButton>
|
||||
@@ -122,6 +156,11 @@
|
||||
{
|
||||
<MudButton Color="Color.Primary" OnClick="() => { _drawerOpen=false; OpenAuthDialog(); }">ورود
|
||||
</MudButton>
|
||||
<MudButton Variant="Variant.Text"
|
||||
StartIcon="@(_isDark ? Icons.Material.Filled.LightMode : Icons.Material.Filled.DarkMode)"
|
||||
OnClick="ToggleTheme">
|
||||
@(_isDark ? "حالت روشن" : "حالت تاریک")
|
||||
</MudButton>
|
||||
}
|
||||
</MudStack>
|
||||
</MudDrawer>
|
||||
|
||||
@@ -16,11 +16,17 @@ public partial class MainLayout : IDisposable
|
||||
private bool _isAuthenticated;
|
||||
private string? _email;
|
||||
private int _cartCount;
|
||||
|
||||
// متغیرهای بروزرسانی
|
||||
private bool _hasUpdate;
|
||||
private string? _newVersion;
|
||||
private VersionCheckResult? _versionCheckResult;
|
||||
|
||||
[Inject] private ILocalStorageService LocalStorage { get; set; } = default!;
|
||||
[Inject] private AuthService AuthService { get; set; } = default!;
|
||||
[Inject] private AuthDialogService AuthDialogService { get; set; } = default!;
|
||||
[Inject] private CartService CartService { get; set; } = default!;
|
||||
[Inject] private AppVersionService AppVersionService { get; set; } = default!;
|
||||
|
||||
private void ToggleTheme() => _isDark = !_isDark;
|
||||
private void ToggleDrawer() => _drawerOpen = !_drawerOpen;
|
||||
@@ -42,12 +48,83 @@ public partial class MainLayout : IDisposable
|
||||
await CartService.EnsureInitializedAsync();
|
||||
CartService.OnChange += OnCartChanged;
|
||||
_cartCount = CartService.Count;
|
||||
|
||||
// چک کردن بروزرسانی (بدون نمایش popup - فقط برای نشون دادن آیکون)
|
||||
await CheckForUpdateSilentlyAsync();
|
||||
}
|
||||
|
||||
StateHasChanged();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// چک کردن بروزرسانی بدون نمایش popup
|
||||
/// </summary>
|
||||
private async Task CheckForUpdateSilentlyAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
_versionCheckResult = await AppVersionService.CheckVersionAsync(ignoreSkipped: true);
|
||||
|
||||
if (_versionCheckResult.HasNewVersion && !string.IsNullOrEmpty(_versionCheckResult.NewVersion))
|
||||
{
|
||||
_hasUpdate = true;
|
||||
_newVersion = _versionCheckResult.NewVersion;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// در صورت خطا نادیده بگیر
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// باز کردن دیالوگ بروزرسانی
|
||||
/// </summary>
|
||||
private async Task OpenUpdateDialog()
|
||||
{
|
||||
if (_versionCheckResult == null || string.IsNullOrEmpty(_versionCheckResult.NewVersion))
|
||||
return;
|
||||
|
||||
// ثبت زمان نمایش دیالوگ
|
||||
await AppVersionService.RecordDialogShownAsync();
|
||||
|
||||
var dialogOptions = new DialogOptions
|
||||
{
|
||||
BackdropClick = !_versionCheckResult.IsForceUpdate,
|
||||
CloseOnEscapeKey = !_versionCheckResult.IsForceUpdate,
|
||||
CloseButton = !_versionCheckResult.IsForceUpdate,
|
||||
MaxWidth = MaxWidth.Small,
|
||||
FullWidth = true
|
||||
};
|
||||
|
||||
var parameters = new DialogParameters<ReleaseNotesDialog>
|
||||
{
|
||||
{ x => x.OldVersion, _versionCheckResult.OldVersion },
|
||||
{ x => x.NewVersion, _versionCheckResult.NewVersion },
|
||||
{ x => x.ReleaseNotes, _versionCheckResult.ReleaseNotes },
|
||||
{ x => x.UpdateMessage, _versionCheckResult.UpdateMessage },
|
||||
{ x => x.IsForceUpdate, _versionCheckResult.IsForceUpdate }
|
||||
};
|
||||
|
||||
var dialog = await DialogService.ShowAsync<ReleaseNotesDialog>("بروزرسانی", parameters, dialogOptions);
|
||||
var result = await dialog.Result;
|
||||
|
||||
if (result is { Canceled: false, Data: bool shouldUpdate })
|
||||
{
|
||||
if (shouldUpdate)
|
||||
{
|
||||
await AppVersionService.ApplyUpdateAsync(_versionCheckResult.NewVersion);
|
||||
Navigation.NavigateTo(Navigation.Uri, forceLoad: true);
|
||||
}
|
||||
else
|
||||
{
|
||||
await AppVersionService.SkipVersionAsync(_versionCheckResult.NewVersion);
|
||||
// نمایش آپدیت همچنان باقی بمونه (hasUpdate true بمونه)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void OnCartChanged()
|
||||
{
|
||||
_cartCount = CartService.Count;
|
||||
|
||||
@@ -0,0 +1,130 @@
|
||||
@using FrontOffice.Main.Utilities
|
||||
@using MudBlazor
|
||||
|
||||
<MudDialog>
|
||||
<TitleContent>
|
||||
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
|
||||
<MudIcon Icon="@Icons.Material.Filled.SystemUpdateAlt" Color="Color.Primary" Size="Size.Large"/>
|
||||
<MudText Typo="Typo.h6">
|
||||
@if (IsForceUpdate)
|
||||
{
|
||||
<span>بروزرسانی اجباری</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span>نسخه جدید موجود است</span>
|
||||
}
|
||||
</MudText>
|
||||
</MudStack>
|
||||
</TitleContent>
|
||||
|
||||
<DialogContent>
|
||||
<MudStack Spacing="3">
|
||||
@* اطلاعات نسخه *@
|
||||
<MudPaper Class="pa-3" Elevation="0" Style="background-color: var(--mud-palette-background-grey);">
|
||||
<MudStack Row="true" Justify="Justify.SpaceBetween">
|
||||
<MudText>نسخه فعلی:</MudText>
|
||||
<MudText Color="Color.Secondary">@(OldVersion ?? "---")</MudText>
|
||||
</MudStack>
|
||||
<MudDivider Class="my-2"/>
|
||||
<MudStack Row="true" Justify="Justify.SpaceBetween">
|
||||
<MudText>نسخه جدید:</MudText>
|
||||
<MudText Color="Color.Primary"><b>@NewVersion</b></MudText>
|
||||
</MudStack>
|
||||
</MudPaper>
|
||||
|
||||
@* پیام آپدیت *@
|
||||
@if (!string.IsNullOrWhiteSpace(UpdateMessage))
|
||||
{
|
||||
<MudAlert Severity="@(IsForceUpdate ? Severity.Warning : Severity.Info)"
|
||||
Variant="Variant.Outlined"
|
||||
Dense="true">
|
||||
@UpdateMessage
|
||||
</MudAlert>
|
||||
}
|
||||
|
||||
@* یادداشتهای انتشار *@
|
||||
@if (!string.IsNullOrWhiteSpace(ReleaseNotes))
|
||||
{
|
||||
<MudText Typo="Typo.subtitle2" Color="Color.Primary">تغییرات این نسخه:</MudText>
|
||||
<MudPaper Class="pa-3" Elevation="1" Style="max-height: 250px; overflow-y: auto;">
|
||||
@((MarkupString)ReleaseNotes)
|
||||
</MudPaper>
|
||||
}
|
||||
|
||||
@if (IsForceUpdate)
|
||||
{
|
||||
<MudAlert Severity="Severity.Error" Variant="Variant.Filled" Dense="true">
|
||||
<MudText Typo="Typo.body2">
|
||||
این بروزرسانی اجباری است و باید انجام شود.
|
||||
</MudText>
|
||||
</MudAlert>
|
||||
}
|
||||
</MudStack>
|
||||
</DialogContent>
|
||||
|
||||
<DialogActions>
|
||||
@if (!IsForceUpdate)
|
||||
{
|
||||
<MudButton OnClick="OnSkipClicked"
|
||||
Color="Color.Default"
|
||||
Variant="Variant.Text">
|
||||
بعداً
|
||||
</MudButton>
|
||||
}
|
||||
<MudButton OnClick="OnUpdateClicked"
|
||||
Color="Color.Primary"
|
||||
Variant="Variant.Filled"
|
||||
StartIcon="@Icons.Material.Filled.Update">
|
||||
@if (_isUpdating)
|
||||
{
|
||||
<MudProgressCircular Size="Size.Small" Indeterminate="true" Color="Color.Surface"/>
|
||||
<span class="ms-2">در حال بروزرسانی...</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span>بروزرسانی</span>
|
||||
}
|
||||
</MudButton>
|
||||
</DialogActions>
|
||||
</MudDialog>
|
||||
|
||||
@code {
|
||||
[CascadingParameter]
|
||||
private IMudDialogInstance MudDialog { get; set; } = default!;
|
||||
|
||||
[Parameter]
|
||||
public string? OldVersion { get; set; }
|
||||
|
||||
[Parameter]
|
||||
public string NewVersion { get; set; } = string.Empty;
|
||||
|
||||
[Parameter]
|
||||
public string? ReleaseNotes { get; set; }
|
||||
|
||||
[Parameter]
|
||||
public string? UpdateMessage { get; set; }
|
||||
|
||||
[Parameter]
|
||||
public bool IsForceUpdate { get; set; }
|
||||
|
||||
private bool _isUpdating;
|
||||
|
||||
private async Task OnUpdateClicked()
|
||||
{
|
||||
_isUpdating = true;
|
||||
StateHasChanged();
|
||||
|
||||
// کمی صبر کنیم برای UI
|
||||
await Task.Delay(500);
|
||||
|
||||
// برگردوندن نتیجه "آپدیت"
|
||||
MudDialog.Close(DialogResult.Ok(true));
|
||||
}
|
||||
|
||||
private void OnSkipClicked()
|
||||
{
|
||||
// برگردوندن نتیجه "بعداً"
|
||||
MudDialog.Close(DialogResult.Ok(false));
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,50 @@
|
||||
using FrontOffice.BFF.Configuration.Protobuf.Protos.AppVersion;
|
||||
using Blazored.LocalStorage;
|
||||
using Microsoft.JSInterop;
|
||||
|
||||
namespace FrontOffice.Main.Utilities;
|
||||
|
||||
/// <summary>
|
||||
/// نتیجه بررسی نسخه اپلیکیشن
|
||||
/// </summary>
|
||||
public class VersionCheckResult
|
||||
{
|
||||
/// <summary>
|
||||
/// آیا نسخه جدیدی وجود دارد
|
||||
/// </summary>
|
||||
public bool HasNewVersion { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// آیا آپدیت اجباری است (force update)
|
||||
/// </summary>
|
||||
public bool IsForceUpdate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// نسخه فعلی (local)
|
||||
/// </summary>
|
||||
public string? OldVersion { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// نسخه جدید (server)
|
||||
/// </summary>
|
||||
public string? NewVersion { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// یادداشتهای انتشار
|
||||
/// </summary>
|
||||
public string? ReleaseNotes { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// پیام آپدیت
|
||||
/// </summary>
|
||||
public string? UpdateMessage { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// آیا کش باید پاک شود
|
||||
/// </summary>
|
||||
public bool RequiresCacheClear { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// سرویس مدیریت نسخه اپلیکیشن و کش
|
||||
/// وقتی نسخه جدید منتشر بشه، این سرویس متوجه میشه و کش رو پاک میکنه
|
||||
@@ -11,31 +53,44 @@ public class AppVersionService
|
||||
{
|
||||
private readonly AppVersionContract.AppVersionContractClient _client;
|
||||
private readonly ILocalStorageService _localStorage;
|
||||
private readonly IJSRuntime _jsRuntime;
|
||||
private readonly ILogger<AppVersionService> _logger;
|
||||
|
||||
private const string APP_NAME = "FrontOffice";
|
||||
private const string APP_NAME = "KaraBazarApp";
|
||||
private const string LOCAL_VERSION_KEY = "app_version";
|
||||
private const string LAST_CHECK_KEY = "app_version_last_check";
|
||||
private const string SKIPPED_VERSION_KEY = "app_version_skipped";
|
||||
private const string LAST_DIALOG_SHOWN_KEY = "app_version_last_dialog_shown";
|
||||
|
||||
public AppVersionService(
|
||||
AppVersionContract.AppVersionContractClient client,
|
||||
ILocalStorageService localStorage,
|
||||
IJSRuntime jsRuntime,
|
||||
ILogger<AppVersionService> logger)
|
||||
{
|
||||
_client = client;
|
||||
_localStorage = localStorage;
|
||||
_jsRuntime = jsRuntime;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// بررسی نسخه اپلیکیشن و پاک کردن کش در صورت نیاز
|
||||
/// بررسی نسخه اپلیکیشن و برگرداندن نتیجه
|
||||
/// </summary>
|
||||
public async Task CheckVersionAndClearCacheIfNeededAsync()
|
||||
/// <param name="ignoreSkipped">اگر true باشه، نسخههای skip شده هم نشون داده میشن (برای آیکون منو)</param>
|
||||
/// <param name="forDialog">اگر true باشه، چک میکنه که یک روز از آخرین نمایش گذشته (برای popup)</param>
|
||||
public async Task<VersionCheckResult> CheckVersionAsync(bool ignoreSkipped = false, bool forDialog = false)
|
||||
{
|
||||
var result = new VersionCheckResult();
|
||||
|
||||
try
|
||||
{
|
||||
// دریافت نسخه فعلی از localStorage
|
||||
var localVersion = await _localStorage.GetItemAsStringAsync(LOCAL_VERSION_KEY);
|
||||
var skippedVersion = await _localStorage.GetItemAsStringAsync(SKIPPED_VERSION_KEY);
|
||||
var lastDialogShown = await _localStorage.GetItemAsStringAsync(LAST_DIALOG_SHOWN_KEY);
|
||||
|
||||
result.OldVersion = localVersion;
|
||||
|
||||
// بررسی نسخه از سرور
|
||||
var response = await _client.GetAppVersionAsync(new GetAppVersionRequest
|
||||
@@ -47,32 +102,119 @@ public class AppVersionService
|
||||
if (!response.Found)
|
||||
{
|
||||
_logger.LogWarning("App version not found on server for {AppName}", APP_NAME);
|
||||
return;
|
||||
return result;
|
||||
}
|
||||
|
||||
var serverVersion = response.CurrentVersion;
|
||||
result.NewVersion = serverVersion;
|
||||
result.ReleaseNotes = response.ReleaseNotes;
|
||||
result.UpdateMessage = response.UpdateMessage;
|
||||
result.RequiresCacheClear = response.RequiresFullCacheClear;
|
||||
result.IsForceUpdate = response.RequiresUpdate; // اگر نسخه کمتر از حداقل باشه
|
||||
|
||||
// اگر نسخه جدید باشه یا پاک کردن کش لازم باشه
|
||||
if (localVersion != serverVersion || response.RequiresFullCacheClear)
|
||||
// آیا نسخه جدید داریم؟
|
||||
if (localVersion != serverVersion)
|
||||
{
|
||||
result.HasNewVersion = true;
|
||||
|
||||
// اگر این نسخه رو قبلاً skip کرده و force نیست
|
||||
if (!result.IsForceUpdate && skippedVersion == serverVersion && !ignoreSkipped)
|
||||
{
|
||||
// برای popup: چک کن یک روز گذشته یا نه
|
||||
if (forDialog)
|
||||
{
|
||||
var oneDayPassed = await HasOneDayPassedSinceLastDialogAsync(lastDialogShown);
|
||||
if (!oneDayPassed)
|
||||
{
|
||||
result.HasNewVersion = false;
|
||||
}
|
||||
// اگه یک روز گذشته، HasNewVersion = true میمونه
|
||||
}
|
||||
else
|
||||
{
|
||||
result.HasNewVersion = false;
|
||||
}
|
||||
}
|
||||
|
||||
_logger.LogInformation(
|
||||
"New version detected: {OldVersion} -> {NewVersion}, CacheClear: {CacheClear}",
|
||||
localVersion ?? "null", serverVersion, response.RequiresFullCacheClear);
|
||||
|
||||
// پاک کردن کش
|
||||
await ClearAllCacheAsync();
|
||||
|
||||
// ذخیره نسخه جدید
|
||||
await _localStorage.SetItemAsStringAsync(LOCAL_VERSION_KEY, serverVersion);
|
||||
await _localStorage.SetItemAsStringAsync(LAST_CHECK_KEY, DateTime.UtcNow.ToString("O"));
|
||||
|
||||
_logger.LogInformation("Cache cleared and version updated to {Version}", serverVersion);
|
||||
"Version check: {OldVersion} -> {NewVersion}, Force: {Force}, Skipped: {Skipped}",
|
||||
localVersion ?? "null", serverVersion, result.IsForceUpdate, skippedVersion);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error checking app version");
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// چک کردن اینکه یک روز از آخرین نمایش دیالوگ گذشته یا نه
|
||||
/// </summary>
|
||||
private async Task<bool> HasOneDayPassedSinceLastDialogAsync(string? lastDialogShown)
|
||||
{
|
||||
if (string.IsNullOrEmpty(lastDialogShown))
|
||||
return true; // اگه هیچوقت نشون نداده، نشون بده
|
||||
|
||||
if (DateTime.TryParse(lastDialogShown, out var lastShown))
|
||||
{
|
||||
return DateTime.UtcNow.Subtract(lastShown).TotalDays >= 1;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// ثبت زمان نمایش دیالوگ
|
||||
/// </summary>
|
||||
public async Task RecordDialogShownAsync()
|
||||
{
|
||||
await _localStorage.SetItemAsStringAsync(LAST_DIALOG_SHOWN_KEY, DateTime.UtcNow.ToString("O"));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// اعمال آپدیت - پاک کردن کش و ذخیره نسخه جدید
|
||||
/// </summary>
|
||||
public async Task ApplyUpdateAsync(string newVersion)
|
||||
{
|
||||
try
|
||||
{
|
||||
_logger.LogInformation("Applying update to version {Version}", newVersion);
|
||||
|
||||
// پاک کردن کش
|
||||
await ClearAllCacheAsync();
|
||||
|
||||
// ذخیره نسخه جدید
|
||||
await _localStorage.SetItemAsStringAsync(LOCAL_VERSION_KEY, newVersion);
|
||||
await _localStorage.SetItemAsStringAsync(LAST_CHECK_KEY, DateTime.UtcNow.ToString("O"));
|
||||
|
||||
// پاک کردن نسخه skip شده
|
||||
await _localStorage.RemoveItemAsync(SKIPPED_VERSION_KEY);
|
||||
|
||||
_logger.LogInformation("Update applied successfully to {Version}", newVersion);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error applying update");
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Skip کردن این نسخه (بعداً)
|
||||
/// </summary>
|
||||
public async Task SkipVersionAsync(string version)
|
||||
{
|
||||
try
|
||||
{
|
||||
await _localStorage.SetItemAsStringAsync(SKIPPED_VERSION_KEY, version);
|
||||
_logger.LogInformation("Version {Version} skipped by user", version);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error skipping version");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -82,33 +224,14 @@ public class AppVersionService
|
||||
{
|
||||
try
|
||||
{
|
||||
// لیست کلیدهایی که باید حفظ بشن (مثل توکن و اطلاعات کاربر)
|
||||
var keysToKeep = new HashSet<string>
|
||||
{
|
||||
"access_token",
|
||||
"refresh_token",
|
||||
"user_info",
|
||||
"user_roles"
|
||||
};
|
||||
// پاک کردن کش مرورگر (Cache Storage و Service Worker)
|
||||
await _jsRuntime.InvokeVoidAsync("clearBrowserCache");
|
||||
|
||||
// دریافت همه کلیدها
|
||||
var allKeys = await _localStorage.KeysAsync();
|
||||
|
||||
// پاک کردن کلیدهایی که در لیست حفظ نیستن
|
||||
foreach (var key in allKeys)
|
||||
{
|
||||
if (!keysToKeep.Contains(key) && key != LOCAL_VERSION_KEY)
|
||||
{
|
||||
await _localStorage.RemoveItemAsync(key);
|
||||
}
|
||||
}
|
||||
|
||||
_logger.LogInformation("Local storage cache cleared, {Count} keys removed",
|
||||
allKeys.Count() - keysToKeep.Count);
|
||||
_logger.LogInformation("Browser cache cleared successfully");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Error clearing cache");
|
||||
_logger.LogError(ex, "Error clearing browser cache");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user