From af2b09fdd68d07f157b480e6c88dd7fc528a566c Mon Sep 17 00:00:00 2001
From: pypy <git@pypy.moe>
Date: Sun, 1 Nov 2020 20:19:11 +0900
Subject: [PATCH] use async/await on update()

---
 html/src/app.js | 103 ++++++++++++++++++++++++++----------------------
 html/src/vr.js  |  46 +++++++++++++--------
 2 files changed, 85 insertions(+), 64 deletions(-)

diff --git a/html/src/app.js b/html/src/app.js
index aae98f24..b9dbacb3 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -3287,9 +3287,8 @@ CefSharp.BindObjectAsync(
             LogWatcher.Reset().then(() => {
                 API.$on('SHOW_WORLD_DIALOG', (tag) => this.showWorldDialog(tag));
                 API.$on('SHOW_LAUNCH_DIALOG', (tag) => this.showLaunchDialog(tag));
-                setInterval(() => this.update(), 1000);
-                setInterval(() => this.refreshGameLog(), 100);
-                this.update();
+                this.updateLoop();
+                this.updateGameLogLoop();
                 this.$nextTick(function () {
                     this.$el.style.display = '';
                     this.loginForm.loading = true;
@@ -3354,40 +3353,44 @@ CefSharp.BindObjectAsync(
         });
     };
 
-    $app.methods.update = function () {
-        if (API.isLoggedIn === false) {
-            return;
-        }
-        if (--this.nextRefresh <= 0) {
-            this.nextRefresh = 60;
-            API.getCurrentUser().catch((err1) => {
-                if (err1.status_code === 401) {
-                    API.getConfig().then((args) => {
-                        API.login({
-                            username: this.loginForm.username,
-                            password: this.loginForm.password
-                        }).catch((err2) => {
-                            if (err2.status_code === 401) {
-                                API.logout();
-                            }
-                            throw err2;
-                        });
-                        return args;
+    $app.methods.updateLoop = function () {
+        try {
+            if (API.isLoggedIn === true) {
+                if (--this.nextRefresh <= 0) {
+                    this.nextRefresh = 60;
+                    API.getCurrentUser().catch((err1) => {
+                        if (err1.status_code === 401) {
+                            API.getConfig().then((args) => {
+                                API.login({
+                                    username: this.loginForm.username,
+                                    password: this.loginForm.password
+                                }).catch((err2) => {
+                                    if (err2.status_code === 401) {
+                                        API.logout();
+                                    }
+                                    throw err2;
+                                });
+                                return args;
+                            });
+                        }
+                        throw err1;
                     });
                 }
-                throw err1;
-            });
-        }
-        this.checkActiveFriends();
-        VRCX.CheckGameRunning().then(([isGameRunning, isGameNoVR]) => {
-            if (isGameRunning !== this.isGameRunning) {
-                this.isGameRunning = isGameRunning;
-                Discord.SetTimestamps(Date.now(), 0);
+                this.checkActiveFriends();
+                VRCX.CheckGameRunning().then(([isGameRunning, isGameNoVR]) => {
+                    if (isGameRunning !== this.isGameRunning) {
+                        this.isGameRunning = isGameRunning;
+                        Discord.SetTimestamps(Date.now(), 0);
+                    }
+                    this.isGameNoVR = isGameNoVR;
+                    this.updateDiscord();
+                    this.updateOpenVR();
+                });
             }
-            this.isGameNoVR = isGameNoVR;
-            this.updateDiscord();
-            this.updateOpenVR();
-        });
+        } catch (err) {
+            console.error(err);
+        }
+        setTimeout(() => this.updateLoop(), 500);
     };
 
     $app.methods.updateSharedFeed = function () {
@@ -4470,11 +4473,25 @@ CefSharp.BindObjectAsync(
         });
     };
 
-    $app.methods.refreshGameLog = async function () {
-        if (API.isLoggedIn !== true) {
-            return;
-        }
+    $app.methods.updateGameLogLoop = async function () {
+        try {
+            if (API.isLoggedIn === true) {
+                await this.updateGameLog();
+                this.sweepGameLog();
 
+                if (this.gameLogTable.data.length > 0) {
+                    this.notifyMenu('gameLog');
+                }
+
+                this.updateSharedFeed();
+            }
+        } catch (err) {
+            console.error(err);
+        }
+        setTimeout(() => this.updateGameLogLoop(), 1000);
+    };
+
+    $app.methods.updateGameLog = async function () {
         var currentUser = API.currentUser.username;
 
         for (var [fileName, dt, type, ...args] of await LogWatcher.Get()) {
@@ -4556,15 +4573,7 @@ CefSharp.BindObjectAsync(
                 this.gameLogTable.data.push(gameLogTableData);
             }
         }
-
-        this.sweepGameLog();
-
-        if (this.gameLogTable.data.length > 0) {
-            this.notifyMenu('gameLog');
-        }
-
-        this.updateSharedFeed();
-    };
+    }
 
     $app.methods.sweepGameLog = function () {
         var { data } = this.gameLogTable;
diff --git a/html/src/vr.js b/html/src/vr.js
index 5a3c322c..6c10c35a 100644
--- a/html/src/vr.js
+++ b/html/src/vr.js
@@ -647,8 +647,8 @@ CefSharp.BindObjectAsync(
                 // FIXME: 어케 복구하냐 이건
                 throw err;
             }).then((args) => {
-                setInterval(() => this.update(), 1000);
-                this.update();
+                this.updateLoop();
+                this.updateCpuUsageLoop();
                 this.$nextTick(function () {
                     if (this.appType === '1') {
                         this.$el.style.display = '';
@@ -659,24 +659,36 @@ CefSharp.BindObjectAsync(
         }
     };
 
-    $app.methods.update = function () {
-        this.currentTime = new Date().toJSON();
-        this.currentUser = VRCXStorage.GetObject('currentUser') || {};
-        VRCX.CpuUsage().then((cpuUsage) => {
-            this.cpuUsage = cpuUsage.toFixed(2);
-        });
-        if (VRCXStorage.GetBool('VRCX_hideDevicesFromFeed') === false) {
-            VRCX.GetVRDevices().then((devices) => {
-                devices.forEach((device) => {
-                    device[2] = parseInt(device[2], 10);
+    $app.methods.updateLoop = async function () {
+        try {
+            this.currentTime = new Date().toJSON();
+            this.currentUser = VRCXStorage.GetObject('currentUser') || {};
+            if (VRCXStorage.GetBool('VRCX_hideDevicesFromFeed') === false) {
+                VRCX.GetVRDevices().then((devices) => {
+                    devices.forEach((device) => {
+                        device[2] = parseInt(device[2], 10);
+                    });
+                    this.devices = devices;
                 });
-                this.devices = devices;
-            });
+            }
+            else {
+                this.devices = '';
+            }
+            this.updateSharedFeed();
+        } catch (err) {
+            console.error(err);
         }
-        else {
-            this.devices = '';
+        setTimeout(() => this.updateLoop(), 500);
+    };
+
+    $app.methods.updateCpuUsageLoop = async function() {
+        try {
+            var cpuUsage = await VRCX.CpuUsage();
+            this.cpuUsage = cpuUsage.toFixed(2);
+        } catch (err) {
+            console.error(err);
         }
-        this.updateSharedFeed();
+        setTimeout(() => this.updateCpuUsageLoop(), 1000);
     };
 
     $app.methods.updateSharedFeed = function () {