mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-02 13:06:08 +02:00
refactor: app.js (#1291)
* refactor: frontend * Fix avatar gallery sort * Update .NET dependencies * Update npm dependencies electron v37.1.0 * bulkRefreshFriends * fix dark theme * Remove crowdin * Fix config.json dialog not updating * VRCX log file fixes & add Cef log * Remove SharedVariable, fix startup * Revert init theme change * Logging date not working? Fix WinformThemer designer error * Add Cef request hander, no more escaping main page * clean * fix * fix * clean * uh * Apply thememode at startup, fixes random user colours * Split database into files * Instance info remove empty lines * Open external VRC links with VRCX * Electron fixes * fix userdialog style * ohhhh * fix store * fix store * fix: load all group members after kicking a user * fix: world dialog favorite button style * fix: Clear VRCX Cache Timer input value * clean * Fix VR overlay * Fix VR overlay 2 * Fix Discord discord rich presence for RPC worlds * Clean up age verified user tags * Fix playerList being occupied after program reload * no `this` * Fix login stuck loading * writable: false * Hide dialogs on logout * add flush sync option * rm LOGIN event * rm LOGOUT event * remove duplicate event listeners * remove duplicate event listeners * clean * remove duplicate event listeners * clean * fix theme style * fix t * clearable * clean * fix ipcEvent * Small changes * Popcorn Palace support * Remove checkActiveFriends * Clean up * Fix dragEnterCef * Block API requests when not logged in * Clear state on login & logout * Fix worldDialog instances not updating * use <script setup> * Fix avatar change event, CheckGameRunning at startup * Fix image dragging * fix * Remove PWI * fix updateLoop * add webpack-dev-server to dev environment * rm unnecessary chunks * use <script setup> * webpack-dev-server changes * use <script setup> * use <script setup> * Fix UGC text size * Split login event * t * use <script setup> * fix * Update .gitignore and enable checkJs in jsconfig * fix i18n t * use <script setup> * use <script setup> * clean * global types * fix * use checkJs for debugging * Add watchState for login watchers * fix .vue template * type fixes * rm Vue.filter * Cef v138.0.170, VC++ 2022 * Settings fixes * Remove 'USER:CURRENT' * clean up 2FA callbacks * remove userApply * rm i18n import * notification handling to use notification store methods * refactor favorite handling to use favorite store methods and clean up event emissions * refactor moderation handling to use dedicated functions for player moderation events * refactor friend handling to use dedicated functions for friend events * Fix program startup, move lang init * Fix friend state * Fix status change error * Fix user notes diff * fix * rm group event * rm auth event * rm avatar event * clean * clean * getUser * getFriends * getFavoriteWorlds, getFavoriteAvatars * AvatarGalleryUpload btn style & package.json update * Fix friend requests * Apply user * Apply world * Fix note diff * Fix VR overlay * Fixes * Update build scripts * Apply avatar * Apply instance * Apply group * update hidden VRC+ badge * Fix sameInstance "private" * fix 502/504 API errors * fix 502/504 API errors * clean * Fix friend in same instance on orange showing twice in friends list * Add back in broken friend state repair methods * add types --------- Co-authored-by: Natsumi <cmcooper123@hotmail.com>
This commit is contained in:
pa
GitHub
+140
-55
@@ -1,76 +1,161 @@
|
||||
import sqliteService from './sqlite.js';
|
||||
import sharedRepository, { SharedRepository } from './shared.js';
|
||||
import * as workerTimers from 'worker-timers';
|
||||
|
||||
var dirtyKeySet = new Set();
|
||||
|
||||
function transformKey(key) {
|
||||
return `config:${String(key).toLowerCase()}`;
|
||||
}
|
||||
|
||||
async function syncLoop() {
|
||||
if (dirtyKeySet.size > 0) {
|
||||
try {
|
||||
await sqliteService.executeNonQuery('BEGIN');
|
||||
try {
|
||||
for (var key of dirtyKeySet) {
|
||||
var value = await sharedRepository.getString(key);
|
||||
if (value === null) {
|
||||
await sqliteService.executeNonQuery(
|
||||
'DELETE FROM configs WHERE `key` = @key',
|
||||
{
|
||||
'@key': key
|
||||
}
|
||||
);
|
||||
} else {
|
||||
await sqliteService.executeNonQuery(
|
||||
'INSERT OR REPLACE INTO configs (`key`, `value`) VALUES (@key, @value)',
|
||||
{
|
||||
'@key': key,
|
||||
'@value': value
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
dirtyKeySet.clear();
|
||||
} finally {
|
||||
await sqliteService.executeNonQuery('COMMIT');
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
}
|
||||
}
|
||||
workerTimers.setTimeout(() => syncLoop(), 100);
|
||||
}
|
||||
|
||||
class ConfigRepository extends SharedRepository {
|
||||
class ConfigRepository {
|
||||
async init() {
|
||||
await sqliteService.executeNonQuery(
|
||||
'CREATE TABLE IF NOT EXISTS configs (`key` TEXT PRIMARY KEY, `value` TEXT)'
|
||||
);
|
||||
await sqliteService.execute(
|
||||
([key, value]) => sharedRepository.setString(key, value),
|
||||
'SELECT `key`, `value` FROM configs'
|
||||
);
|
||||
syncLoop();
|
||||
}
|
||||
|
||||
async remove(key) {
|
||||
var _key = transformKey(key);
|
||||
await sharedRepository.remove(_key);
|
||||
dirtyKeySet.add(_key);
|
||||
const _key = transformKey(key);
|
||||
await sqliteService.executeNonQuery(
|
||||
`DELETE FROM configs WHERE key = @key`,
|
||||
{
|
||||
'@key': _key
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
getString(key, defaultValue = null) {
|
||||
var _key = transformKey(key);
|
||||
return sharedRepository.getString(_key, defaultValue);
|
||||
/**
|
||||
* @param {string} key
|
||||
* @param {string} defaultValue
|
||||
* @returns {Promise<string | null>}
|
||||
*/
|
||||
async getString(key, defaultValue = null) {
|
||||
const _key = transformKey(key);
|
||||
let value = undefined;
|
||||
await sqliteService.execute(
|
||||
(row) => {
|
||||
value = row[0];
|
||||
},
|
||||
`SELECT value FROM configs WHERE key = @key`,
|
||||
{
|
||||
'@key': _key
|
||||
}
|
||||
);
|
||||
|
||||
if (value === null || value === undefined || value === 'undefined') {
|
||||
return defaultValue;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {string} key
|
||||
* @param {string} value
|
||||
* @returns {Promise<void>}
|
||||
*/
|
||||
async setString(key, value) {
|
||||
var _key = transformKey(key);
|
||||
var _value = String(value);
|
||||
await sharedRepository.setString(_key, _value);
|
||||
dirtyKeySet.add(_key);
|
||||
const _key = transformKey(key);
|
||||
const _value = String(value);
|
||||
await sqliteService.executeNonQuery(
|
||||
`INSERT OR REPLACE INTO configs (key, value) VALUES (@key, @value)`,
|
||||
{
|
||||
'@key': _key,
|
||||
'@value': _value
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {string} key
|
||||
* @param {boolean} defaultValue
|
||||
* @returns {Promise<boolean | null>}
|
||||
*/
|
||||
async getBool(key, defaultValue = null) {
|
||||
const value = await this.getString(key, null);
|
||||
if (value === null || value === undefined) {
|
||||
return defaultValue;
|
||||
}
|
||||
return value === 'true';
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {string} key
|
||||
* @param {boolean} value
|
||||
* @returns {Promise<void>}
|
||||
*/
|
||||
async setBool(key, value) {
|
||||
await this.setString(key, value ? 'true' : 'false');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {string} key
|
||||
* @param {number} defaultValue
|
||||
* @returns {Promise<number | null>}
|
||||
*/
|
||||
async getInt(key, defaultValue = null) {
|
||||
let value = await this.getString(key, null);
|
||||
if (value === null || value === undefined) {
|
||||
return defaultValue;
|
||||
}
|
||||
value = parseInt(value, 10);
|
||||
if (isNaN(value) === true) {
|
||||
return defaultValue;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
async setInt(key, value) {
|
||||
await this.setString(key, value);
|
||||
}
|
||||
|
||||
async getFloat(key, defaultValue = null) {
|
||||
let value = await this.getString(key, null);
|
||||
if (value === null || value === undefined) {
|
||||
return defaultValue;
|
||||
}
|
||||
value = parseFloat(value);
|
||||
if (isNaN(value) === true) {
|
||||
return defaultValue;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
async setFloat(key, value) {
|
||||
await this.setString(key, value);
|
||||
}
|
||||
|
||||
async getObject(key, defaultValue = null) {
|
||||
let value = await this.getString(key, null);
|
||||
if (value === null || value === undefined) {
|
||||
return defaultValue;
|
||||
}
|
||||
try {
|
||||
value = JSON.parse(value);
|
||||
} catch {
|
||||
// ignore JSON parse errors
|
||||
}
|
||||
if (value !== Object(value)) {
|
||||
return defaultValue;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
async setObject(key, value) {
|
||||
await this.setString(key, JSON.stringify(value));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {string} key
|
||||
* @param {Array} defaultValue
|
||||
* @returns {Promise<Array | null>}
|
||||
*/
|
||||
async getArray(key, defaultValue = null) {
|
||||
const value = await this.getObject(key, null);
|
||||
if (Array.isArray(value) === false) {
|
||||
return defaultValue;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
async setArray(key, value) {
|
||||
await this.setObject(key, value);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user