Refactor SQLite to inform user of database errors

Dotnet/SQLite.cs

@@ -44,26 +44,15 @@ namespace VRCX
             m_Connection.Close();
             m_Connection.Dispose();
         }
-        
-        public string ExecuteJson(string sql, IDictionary<string, object> args = null)
+
+        // for Electron
+        public string ExecuteJson(string sql, IDictionary<string, object>? args = null)
         {
             var result = Execute(sql, args);
-            if (result.Item1 != null)
-            {
-                return JsonSerializer.Serialize(new
-                {
-                    status = "error",
-                    message = result.Item1
-                });
-            }
-            return JsonSerializer.Serialize(new
-            {
-                status = "success",
-                data = result.Item2
-            });
+            return JsonSerializer.Serialize(result);
         }
 
-        public Tuple<string, object[]> Execute(string sql, IDictionary<string, object> args = null)
+        public object[][] Execute(string sql, IDictionary<string, object>? args = null)
         {
             m_ConnectionLock.EnterReadLock();
             try
@@ -88,11 +77,7 @@ namespace VRCX
                     }
                     result.Add(values);
                 }
-                return new Tuple<string, object[]>(null, result.ToArray());
-            }
-            catch (Exception ex)
-            {
-                return new Tuple<string, object[]>(ex.Message, null);
+                return result.ToArray();
             }
             finally
             {
@@ -100,9 +85,9 @@ namespace VRCX
             }
         }
 
-        public int ExecuteNonQuery(string sql, IDictionary<string, object> args = null)
+        public int ExecuteNonQuery(string sql, IDictionary<string, object>? args = null)
         {
-            int result = -1;
+            var result = -1;
             m_ConnectionLock.EnterWriteLock();
             try
             {

Dotnet/WebApi.cs

@@ -130,7 +130,7 @@ namespace VRCX
             );
             try
             {
-                var item = (object[])values.Item2[0];
+                var item = values[0];
                 using var stream = new MemoryStream(Convert.FromBase64String((string)item[0]));
                 _cookieContainer = new CookieContainer();
                 _cookieContainer.Add(System.Text.Json.JsonSerializer.Deserialize<CookieCollection>(stream));

src/components/dialogs/GroupDialog/GroupDialog.vue

@@ -957,7 +957,7 @@
                                 <div class="detail">
                                     <span
                                         class="name"
-                                        :style="{ color: user.user.$userColour }"
+                                        :style="{ color: user.user?.$userColour }"
                                         v-text="user.user.displayName" />
                                     <span class="extra">
                                         <template v-if="hasGroupPermission(groupDialog.ref, 'group-members-manage')">
@@ -1018,7 +1018,7 @@
                                 <div class="detail">
                                     <span
                                         class="name"
-                                        :style="{ color: user.user.$userColour }"
+                                        :style="{ color: user.user?.$userColour }"
                                         v-text="user.user.displayName" />
                                     <span class="extra">
                                         <template v-if="hasGroupPermission(groupDialog.ref, 'group-members-manage')">

src/components/dialogs/InviteDialog/EditAndSendInviteDialog.vue

@@ -24,7 +24,7 @@
             <el-button @click="cancelEditAndSendInvite">
                 {{ t('dialog.edit_send_invite_message.cancel') }}
             </el-button>
-            <el-button type="primary" @click="saveEditAndSendInvite">
+            <el-button type="primary" @click="saveEditAndSendInvite" :disabled="!editAndSendInviteDialog.newMessage">
                 {{ t('dialog.edit_send_invite_message.send') }}
             </el-button>
         </template>

src/service/sqlite.js

@@ -1,35 +1,73 @@
-// requires binding of SQLite
+import { ElMessageBox } from 'element-plus';
 
+import { openExternalLink } from '../shared/utils';
+
+// requires binding of SQLite
 class SQLiteService {
-    async execute(callback, sql, args = null) {
-        if (LINUX) {
-            if (args) {
-                args = new Map(Object.entries(args));
+    handleSQLiteError(e) {
+        if (typeof e.message === 'string') {
+            if (e.message.includes('database disk image is malformed')) {
+                ElMessageBox.confirm(
+                    'Please repair or delete your database file by following these instructions.',
+                    'Your database is corrupted',
+                    {
+                        confirmButtonText: 'Confirm',
+                        type: 'warning'
+                    }
+                )
+                    .then(async (action) => {
+                        if (action !== 'confirm') return;
+                        openExternalLink(
+                            'https://github.com/vrcx-team/VRCX/wiki#how-to-repair-vrcx-database'
+                        );
+                    })
+                    .catch(() => {});
             }
-            var json = await SQLite.ExecuteJson(sql, args);
-            var items = JSON.parse(json);
-            if (json.status === 'error') {
-                throw new Error(json.message);
+            if (e.message.includes('database or disk is full')) {
+                ElMessageBox.alert(
+                    'Please free up some disk space.',
+                    'Disk containing database is full',
+                    {
+                        confirmButtonText: 'OK',
+                        type: 'warning'
+                    }
+                ).catch(() => {});
             }
-            items.data.forEach((item) => {
-                callback(item);
-            });
-            return;
         }
-        var item = await SQLite.Execute(sql, args);
-        if (item.Item1 !== null) {
-            throw item.Item1;
-        }
-        item.Item2?.forEach((item) => {
-            callback(item);
-        });
+        throw e;
     }
 
-    executeNonQuery(sql, args = null) {
-        if (LINUX && args) {
-            args = new Map(Object.entries(args));
+    async execute(callback, sql, args = null) {
+        try {
+            if (LINUX) {
+                if (args) {
+                    args = new Map(Object.entries(args));
+                }
+                var json = await SQLite.ExecuteJson(sql, args);
+                var items = JSON.parse(json);
+                items.forEach((item) => {
+                    callback(item);
+                });
+                return;
+            }
+            var data = await SQLite.Execute(sql, args);
+            data.forEach((row) => {
+                callback(row);
+            });
+        } catch (e) {
+            this.handleSQLiteError(e);
+        }
+    }
+
+    async executeNonQuery(sql, args = null) {
+        try {
+            if (LINUX && args) {
+                args = new Map(Object.entries(args));
+            }
+            return await SQLite.ExecuteNonQuery(sql, args);
+        } catch (e) {
+            this.handleSQLiteError(e);
         }
-        return SQLite.ExecuteNonQuery(sql, args);
     }
 }
 

src/types/globals.d.ts

@@ -22,7 +22,7 @@ declare global {
         utils: any;
         dayjs: any;
         configRepository: any;
-        datebase: any;
+        database: any;
         gameLogService: any;
         crypto: any;
         sqliteService: any;
@@ -120,12 +120,9 @@ declare global {
     };
 
     const SQLite: {
-        Execute: (
-            sql: string,
-            args: string
-        ) => Promise<{ Item1: any; Item2: any[] }>;
+        Execute: (sql: string, args: string) => Promise<any[]>;
         ExecuteJson: (sql: string, args: string) => Promise<string>;
-        ExecuteNonQuery: (sql: string, args: string) => Promise<void>;
+        ExecuteNonQuery: (sql: string, args: string) => Promise<Number>;
     };
 
     const LogWatcher: {

src/views/Notifications/dialogs/EditAndSendInviteResponseDialog.vue

@@ -23,9 +23,12 @@
             <el-button @click="cancelEditAndSendInviteResponse">{{
                 t('dialog.edit_send_invite_response_message.cancel')
             }}</el-button>
-            <el-button type="primary" @click="saveEditAndSendInviteResponse">{{
-                t('dialog.edit_send_invite_response_message.send')
-            }}</el-button>
+            <el-button
+                type="primary"
+                @click="saveEditAndSendInviteResponse"
+                :disabled="!editAndSendInviteResponseDialog.newMessage"
+                >{{ t('dialog.edit_send_invite_response_message.send') }}</el-button
+            >
         </template>
     </el-dialog>
 </template>