From 099ae5ad83c0b3bf4c455155141d8276df7bef90 Mon Sep 17 00:00:00 2001
From: xream <xream@icloud.com>
Date: Sat, 20 Jan 2024 00:24:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=A1=A5=E9=BD=90=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/package.json            |  2 +-
 backend/src/restful/settings.js | 64 ++++++++++++++++++++++-----------
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 8cb3c04..37dcf88 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.185",
+  "version": "2.14.186",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
diff --git a/backend/src/restful/settings.js b/backend/src/restful/settings.js
index 5ba91d5..13d60e5 100644
--- a/backend/src/restful/settings.js
+++ b/backend/src/restful/settings.js
@@ -1,5 +1,6 @@
 import { SETTINGS_KEY, ARTIFACT_REPOSITORY_KEY } from '@/constants';
-import { success } from './response';
+import { success, failed } from './response';
+import { InternalServerError } from '@/restful/errors';
 import $ from '@/core/app';
 import Gist from '@/utils/gist';
 
@@ -10,29 +11,52 @@ export default function register($app) {
 }
 
 async function getSettings(req, res) {
-    let settings = $.read(SETTINGS_KEY);
-    if (!settings) {
-        settings = {};
-        $.write(settings, SETTINGS_KEY);
-    }
+    try {
+        let settings = $.read(SETTINGS_KEY);
+        if (!settings) {
+            settings = {};
+            $.write(settings, SETTINGS_KEY);
+        }
 
-    if (!settings.avatarUrl) await updateGitHubAvatar();
-    if (!settings.artifactStore) await updateArtifactStore();
-    success(res, settings);
-    // TODO: 缺错误处理 前端也缺
+        if (!settings.avatarUrl) await updateGitHubAvatar();
+        if (!settings.artifactStore) await updateArtifactStore();
+
+        success(res, settings);
+    } catch (e) {
+        $.error(`Failed to get settings: ${e.message ?? e}`);
+        failed(
+            res,
+            new InternalServerError(
+                `FAILED_TO_GET_SETTINGS`,
+                `Failed to get settings`,
+                `Reason: ${e.message ?? e}`,
+            ),
+        );
+    }
 }
 
 async function updateSettings(req, res) {
-    const settings = $.read(SETTINGS_KEY);
-    const newSettings = {
-        ...settings,
-        ...req.body,
-    };
-    $.write(newSettings, SETTINGS_KEY);
-    await updateGitHubAvatar();
-    await updateArtifactStore();
-    success(res, newSettings);
-    // TODO: 缺错误处理 前端也缺
+    try {
+        const settings = $.read(SETTINGS_KEY);
+        const newSettings = {
+            ...settings,
+            ...req.body,
+        };
+        $.write(newSettings, SETTINGS_KEY);
+        await updateGitHubAvatar();
+        await updateArtifactStore();
+        success(res, newSettings);
+    } catch (e) {
+        $.error(`Failed to update settings: ${e.message ?? e}`);
+        failed(
+            res,
+            new InternalServerError(
+                `FAILED_TO_UPDATE_SETTINGS`,
+                `Failed to update settings`,
+                `Reason: ${e.message ?? e}`,
+            ),
+        );
+    }
 }
 
 export async function updateGitHubAvatar() {