From 6309317945b04f77df69e608f0e69b0eaaccfdb4 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Wed, 10 Jul 2024 18:02:52 +0900
Subject: [PATCH] fix nomodule error

---
 package.json                |  2 +-
 pnpm-lock.yaml              |  2 +-
 src/ts/storage/globalApi.ts | 14 +++++++-------
 src/ts/stores.ts            | 11 +++++++++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 1ac0a75a..2d9fe475 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "markdown-it": "^14.1.0",
     "ml-distance": "^4.0.1",
     "mobile-drag-drop": "3.0.0-rc.0",
-    "msgpackr": "^1.10.1",
+    "msgpackr": "1.10.1",
     "node-html-parser": "^6.1.12",
     "ollama": "^0.5.0",
     "pdfjs-dist": "^4.0.379",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 347b71cb..d29ef1e5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -126,7 +126,7 @@ importers:
         specifier: 3.0.0-rc.0
         version: 3.0.0-rc.0
       msgpackr:
-        specifier: ^1.10.1
+        specifier: 1.10.1
         version: 1.10.1
       node-html-parser:
         specifier: ^6.1.12
diff --git a/src/ts/storage/globalApi.ts b/src/ts/storage/globalApi.ts
index 3a742b04..fb94045b 100644
--- a/src/ts/storage/globalApi.ts
+++ b/src/ts/storage/globalApi.ts
@@ -360,7 +360,7 @@ export async function saveDb(){
 async function getDbBackups() {
     let db = get(DataBase)
     if(db?.account?.useSync){
-        return
+        return []
     }
     if(isTauri){
         const keys = await readDir('database', {dir: BaseDirectory.AppData})
@@ -418,9 +418,8 @@ export async function loadData() {
                     await writeBinaryFileFast('database/database.bin', encodeRisuSave({}));
                 }
                 try {
-                    setDatabase(
-                        decodeRisuSave(await readBinaryFile('database/database.bin',{dir: BaseDirectory.AppData}))
-                    )
+                    const decoded = decodeRisuSave(await readBinaryFile('database/database.bin',{dir: BaseDirectory.AppData}))
+                    setDatabase(decoded)
                 } catch (error) {
                     const backups = await getDbBackups()
                     let backupLoaded = false
@@ -450,10 +449,11 @@ export async function loadData() {
                     await forageStorage.setItem('database/database.bin', gotStorage)
                 }
                 try {
-                    setDatabase(
-                        decodeRisuSave(gotStorage)
-                    )
+                    const decoded = decodeRisuSave(gotStorage)
+                    console.log(decoded)
+                    setDatabase(decoded)
                 } catch (error) {
+                    console.error(error)
                     const backups = await getDbBackups()
                     let backupLoaded = false
                     for(const backup of backups){
diff --git a/src/ts/stores.ts b/src/ts/stores.ts
index 312175e9..3bffe86f 100644
--- a/src/ts/stores.ts
+++ b/src/ts/stores.ts
@@ -198,6 +198,13 @@ async function preInit(){
 }
 
 function onModuleUpdate(){
+    if(!Array.isArray(lastGlobalEnabledModules)){
+        lastGlobalEnabledModules = []
+    }
+    if(!Array.isArray(lastChatEnabledModules)){
+        lastChatEnabledModules = []
+    }
+
     const m = getModules([
         ...lastGlobalEnabledModules, ...lastChatEnabledModules
     ])
@@ -205,6 +212,10 @@ function onModuleUpdate(){
     let moduleHideIcon = false
     let backgroundEmbedding = ''
     m.forEach((module) => {
+        if(!module){
+            return
+        }
+
         if(module.hideIcon){
             moduleHideIcon = true
         }