fix: json pref parsing error

fix: #884
windingwind · Jul 25, 2024 · 2d4b4d5 · 2d4b4d5
1 parent 3e7d6e4
commit 2d4b4d5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/src/modules/defaultPrefs.ts b/src/modules/defaultPrefs.ts
@@ -1,5 +1,5 @@
 import { getService, SERVICES } from "../utils/config";
-import { clearPref, getPref, setPref } from "../utils/prefs";
+import { clearPref, getPref, getPrefJSON, setPref } from "../utils/prefs";
 import { setServiceSecret } from "../utils/secret";
 
 export function setDefaultPrefSettings() {
@@ -17,7 +17,7 @@ export function setDefaultPrefSettings() {
     setPref("targetLanguage", Zotero.locale);
   }
 
-  const secrets = JSON.parse((getPref("secretObj") as string) || "{}");
+  const secrets = getPrefJSON("secretObj");
   for (const serviceId of servicesIds) {
     if (typeof secrets[serviceId] === "undefined") {
       secrets[serviceId] = getService(serviceId).defaultSecret || "";

diff --git a/src/modules/services/cnki.ts b/src/modules/services/cnki.ts
@@ -1,5 +1,5 @@
 import { aesEcbEncrypt, base64 } from "../../utils/crypto";
-import { getPref, setPref } from "../../utils/prefs";
+import { getPref, getPrefJSON, setPref } from "../../utils/prefs";
 import { TranslateTaskProcessor } from "../../utils/task";
 
 export default <TranslateTaskProcessor>async function (data) {
@@ -69,7 +69,7 @@ async function getToken(forceRefresh: boolean = false) {
   // Just in case the update fails
   let doRefresh = true;
   try {
-    const tokenObj = JSON.parse(getPref("cnkiToken") as string);
+    const tokenObj = getPrefJSON("cnkiToken");
     if (
       !forceRefresh &&
       tokenObj?.token &&

diff --git a/src/modules/services/haici.ts b/src/modules/services/haici.ts
@@ -1,4 +1,4 @@
-import { getPref, setPref } from "../../utils/prefs";
+import { getPref, getPrefJSON, setPref } from "../../utils/prefs";
 import { TranslateTaskProcessor } from "../../utils/task";
 
 export default <TranslateTaskProcessor>async function (data) {
@@ -31,7 +31,7 @@ async function getAppId(forceRefresh: boolean = false) {
   // Just in case the update fails
   let doRefresh = true;
   try {
-    const appIdObj = JSON.parse(getPref("haiciAppId") as string);
+    const appIdObj = getPrefJSON("haiciAppId");
     if (
       !forceRefresh &&
       appIdObj &&

diff --git a/src/utils/prefs.ts b/src/utils/prefs.ts
@@ -11,3 +11,12 @@ export function setPref(key: string, value: string | number | boolean) {
 export function clearPref(key: string) {
   return Zotero.Prefs.clear(`${config.prefsPrefix}.${key}`, true);
 }
+
+export function getPrefJSON(key: string) {
+  try {
+    return JSON.parse(String(getPref(key) || "{}"));
+  } catch (e) {
+    setPref(key, "{}");
+  }
+  return {};
+}
diff --git a/src/utils/secret.ts b/src/utils/secret.ts
@@ -1,9 +1,9 @@
 import { SecretValidateResult, getService } from "./config";
-import { getPref, setPref } from "./prefs";
+import { getPref, getPrefJSON, setPref } from "./prefs";
 
 export function getServiceSecret(serviceId: string) {
   try {
-    return JSON.parse(getPref("secretObj") as string)[serviceId] || "";
+    return getPrefJSON("secretObj")[serviceId] || "";
   } catch (e) {
     setPref("secretObj", "{}");
     return "";
@@ -13,7 +13,7 @@ export function getServiceSecret(serviceId: string) {
 export function setServiceSecret(serviceId: string, secret: string) {
   let secrets;
   try {
-    secrets = JSON.parse(getPref("secretObj") as string) || {};
+    secrets = getPrefJSON("secretObj");
   } catch (e) {
     secrets = {};
   }