github/VRCX
1
1
Fork 0
mirror of https://github.com/vrcx-team/VRCX.git synced 2026-04-06 00:32:02 +02:00
Code Issues 51 Packages Projects Releases Wiki Activity

Fix VRCX.json being slow to save

Browse Source
This commit is contained in:
Natsumi
2025-10-16 13:19:40 +11:00
parent 23d9850a25
commit 617d2e161d
6 changed files with 37 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dotnet/Cef/MainForm.cs
View File

@@ -204,7 +204,7 @@ namespace VRCX
VRCXStorage.Instance.Set("VRCX_SizeWidth", LastSizeWidth.ToString());
VRCXStorage.Instance.Set("VRCX_SizeHeight", LastSizeHeight.ToString());
VRCXStorage.Instance.Set("VRCX_WindowState", ((int)LastWindowStateToRestore).ToString());
VRCXStorage.Instance.Flush();
VRCXStorage.Instance.Save();
}
private void MainForm_FormClosed(object sender, FormClosedEventArgs e)

124
Dotnet/VRCXStorage.cs
View File

@@ -1,10 +1,5 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Text.Json;
@@ -15,127 +10,72 @@ namespace VRCX
public class VRCXStorage
{
public static readonly VRCXStorage Instance;
private static readonly ReaderWriterLockSlim m_Lock = new ReaderWriterLockSlim();
private static Dictionary<string, string> m_Storage = new Dictionary<string, string>();
private static readonly string m_JsonPath = Path.Join(Program.AppDataDirectory, "VRCX.json");
private static bool m_Dirty;
private static ConcurrentDictionary<string, string> _storage = new ConcurrentDictionary<string, string>();
private static readonly string JsonPath = Path.Join(Program.AppDataDirectory, "VRCX.json");
private static readonly TimeSpan SaveDebounce = TimeSpan.FromMilliseconds(500);
private static readonly Timer SaveTimer;
private static readonly Lock SaveLock = new Lock();
static VRCXStorage()
{
Instance = new VRCXStorage();
SaveTimer = new Timer(_ => Instance.Save(), null, Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan);
}
public void Load()
{
m_Lock.EnterWriteLock();
try
{
JsonFileSerializer.Deserialize(m_JsonPath, ref m_Storage);
m_Dirty = false;
}
finally
{
m_Lock.ExitWriteLock();
}
var tmp = new Dictionary<string, string>();
JsonFileSerializer.Deserialize(JsonPath, ref tmp);
_storage = new ConcurrentDictionary<string, string>(tmp);
}
public void Save()
{
m_Lock.EnterReadLock();
try
lock (SaveLock)
{
if (m_Dirty)
{
JsonFileSerializer.Serialize(m_JsonPath, m_Storage);
m_Dirty = false;
}
var snapshot = new Dictionary<string, string>(_storage);
JsonFileSerializer.Serialize(JsonPath, snapshot);
}
finally
{
m_Lock.ExitReadLock();
}
}
public void Flush()
{
Save();
}
public void Clear()
{
m_Lock.EnterWriteLock();
try
if (!_storage.IsEmpty)
{
if (m_Storage.Count > 0)
{
m_Storage.Clear();
m_Dirty = true;
}
}
finally
{
m_Lock.ExitWriteLock();
_storage.Clear();
ScheduleSave();
}
}
public bool Remove(string key)
{
m_Lock.EnterWriteLock();
try
{
var result = m_Storage.Remove(key);
if (result)
{
m_Dirty = true;
}
return result;
}
finally
{
m_Lock.ExitWriteLock();
}
var result = _storage.TryRemove(key, out _);
if (result)
ScheduleSave();
return result;
}
public string Get(string key)
{
m_Lock.EnterReadLock();
try
{
return m_Storage.TryGetValue(key, out string value)
? value
: string.Empty;
}
finally
{
m_Lock.ExitReadLock();
}
return _storage.TryGetValue(key, out var value) ? value : string.Empty;
}
public void Set(string key, string value)
{
m_Lock.EnterWriteLock();
try
{
m_Storage[key] = value;
m_Dirty = true;
}
finally
{
m_Lock.ExitWriteLock();
}
_storage[key] = value;
ScheduleSave();
}
public string GetAll()
{
m_Lock.EnterReadLock();
try
{
return JsonSerializer.Serialize(m_Storage);
}
finally
{
m_Lock.ExitReadLock();
}
return JsonSerializer.Serialize(new Dictionary<string, string>(_storage));
}
private static void ScheduleSave()
{
SaveTimer.Change(SaveDebounce, Timeout.InfiniteTimeSpan);
}
}
}
}

2
Dotnet/WebApi.cs
View File

@@ -94,7 +94,7 @@ namespace VRCX
catch (UriFormatException)
{
VRCXStorage.Instance.Set("VRCX_ProxyServer", string.Empty);
VRCXStorage.Instance.Flush();
VRCXStorage.Instance.Save();
const string message = "The proxy server URI you used is invalid.\nVRCX will close, please correct the proxy URI.";
#if !LINUX
System.Windows.Forms.MessageBox.Show(message, "Invalid Proxy URI", MessageBoxButtons.OK, MessageBoxIcon.Error);

9
src/service/jsonStorage.js
View File

@@ -1,5 +1,3 @@
import * as workerTimers from 'worker-timers';
let VRCXStorage = {};
export default class {
@@ -40,12 +38,5 @@ export default class {
VRCXStorage.SetObject = function (key, value) {
this.Set(key, JSON.stringify(value));
};
workerTimers.setInterval(
() => {
VRCXStorage.Flush();
},
5 * 60 * 1000
);
}
}

4
src/stores/settings/general.js
View File

@@ -248,7 +248,7 @@ export const useGeneralSettingsStore = defineStore('GeneralSettings', () => {
'VRCX_ProxyServer',
vrcxStore.proxyServer
);
await VRCXStorage.Flush();
await VRCXStorage.Save();
await new Promise((resolve) => {
workerTimers.setTimeout(resolve, 100);
});
@@ -263,7 +263,7 @@ export const useGeneralSettingsStore = defineStore('GeneralSettings', () => {
'VRCX_ProxyServer',
vrcxStore.proxyServer
);
await VRCXStorage.Flush();
await VRCXStorage.Save();
await new Promise((resolve) => {
workerTimers.setTimeout(resolve, 100);
});

3
src/stores/vrcx.js
View File

@@ -90,7 +90,7 @@ export const useVrcxStore = defineStore('Vrcx', () => {
});
window.electron.onWindowStateChange((event, newState) => {
state.windowState = newState.windowState;
state.windowState = newState.toString();
debounce(saveVRCXWindowOption, 300)();
});
@@ -364,7 +364,6 @@ export const useVrcxStore = defineStore('Vrcx', () => {
VRCXStorage.Set('VRCX_SizeWidth', state.sizeWidth.toString());
VRCXStorage.Set('VRCX_SizeHeight', state.sizeHeight.toString());
VRCXStorage.Set('VRCX_WindowState', state.windowState);
VRCXStorage.Flush();
}
}