bugfix: server delete cache not clean

Author: modstart

changelog.md

@@ -5,6 +5,7 @@
 - 优化：模型连续运行速度优化，避免每次启动带来的损耗
 - 优化：自启动模型状态显示区分（蓝色未运行，绿色运行中）
 - 修复：模型服务自启动类型设置状态异常修复
+- 修复：模型删除重新加在配置缓存问题
 
 ## v1.3.0 直播支持384模型，文生图、图生图模型支持
 

electron/mapi/server/main.ts

@@ -175,6 +175,13 @@ ipcMain.handle("server:cancel", async (event, serverInfo: ServerInfo) => {
     }
 });
 
+ipcMain.handle("server:deletes", async (event, serverInfo: ServerInfo) => {
+    if (serverModule[serverInfo.localPath]) {
+        delete serverModule[serverInfo.localPath];
+    }
+    return true;
+});
+
 ipcMain.handle("server:config", async (event, serverInfo: ServerInfo) => {
     const module = await getModule(serverInfo);
     try {

electron/mapi/server/render.ts

@@ -29,6 +29,10 @@ const cancel = async (serverInfo: ServerInfo) => {
     return ipcRenderer.invoke("server:cancel", serverInfo);
 };
 
+const deletes = async (serverInfo: ServerInfo) => {
+    return ipcRenderer.invoke("server:deletes", serverInfo);
+}
+
 const config = async (serverInfo: ServerInfo) => {
     return ipcRenderer.invoke("server:config", serverInfo);
 };
@@ -56,6 +60,7 @@ export default {
     ping,
     stop,
     cancel,
+    deletes,
     config,
     callFunction,
     callFunctionWithException,

src/declarations/type.d.ts

@@ -365,6 +365,7 @@ type DefsMapi = {
         start: (serverInfo: ServerInfo) => Promise<void>;
         stop: (serverInfo: ServerInfo) => Promise<void>;
         cancel: (serverInfo: ServerInfo) => Promise<void>;
+        deletes: (serverInfo: ServerInfo) => Promise<void>;
         ping: (serverInfo: ServerInfo) => Promise<boolean>;
         config: (serverInfo: ServerInfo) => Promise<any>;
         callFunction: (

src/store/modules/server.ts

@@ -94,7 +94,7 @@ const createEventChannel = (server: ServerRecord, serverRuntime?: ServerRuntime)
                         };
                         Dialog.tipError(data.msg || msgMap[data.type]);
                         setTimeout(() => {
-                            window.$mapi.user.open().then();
+                            $mapi.user.open().then();
                         }, 2000);
                         break;
                 }
@@ -153,7 +153,7 @@ const updateRunningServerCount = async () => {
     const count = serverStoreInstance.records.filter(r => {
         return r.type === EnumServerType.LOCAL_DIR && r.status === EnumServerStatus.RUNNING && !r.autoStart;
     }).length;
-    await window.$mapi.server.runningServerCount(count);
+    await $mapi.server.runningServerCount(count);
 };
 
 export const serverStore = defineStore("server", {
@@ -167,7 +167,7 @@ export const serverStore = defineStore("server", {
             // await serverCloudStore.waitReady()
         },
         async init() {
-            await window.$mapi.storage.get("server", "records", []).then(records => {
+            await $mapi.storage.get("server", "records", []).then(records => {
                 records.forEach((record: ServerRecord) => {
                     record.status = createServerStatus(record);
                     record.runtime = getServerRuntimeComputedValue(record);
@@ -189,12 +189,12 @@ export const serverStore = defineStore("server", {
             this.isReady = true;
         },
         async refresh() {
-            const dirs = await window.$mapi.file.list("model", {
+            const dirs = await $mapi.file.list("model", {
                 isDataPath: true,
             });
             const localRecords: ServerRecord[] = [];
             for (let dir of dirs) {
-                const config = await window.$mapi.file.read(`model/${dir.name}/config.json`, {
+                const config = await $mapi.file.read(`model/${dir.name}/config.json`, {
                     isDataPath: true,
                 });
                 let json;
@@ -295,18 +295,18 @@ export const serverStore = defineStore("server", {
             }.log`;
             serverRuntime.eventChannelName = createEventChannel(server);
             const serverInfo = await this.serverInfo(server);
-            await window.$mapi.server.start(serverInfo);
+            await $mapi.server.start(serverInfo);
             let pingTimeout = 60 * 5 * 1000;
             let pingStart = TimeUtil.timestampMS();
             const pingCheck = () => {
                 const now = TimeUtil.timestampMS();
                 if (now - pingStart > pingTimeout) {
                     // console.log('ping.timeout')
                     serverRuntime.status = EnumServerStatus.ERROR;
-                    window.$mapi.server.stop(serverInfo);
+                    $mapi.server.stop(serverInfo);
                     return;
                 }
-                window.$mapi.server
+                $mapi.server
                     .ping(serverInfo)
                     .then(success => {
                         if (success) {
@@ -332,7 +332,7 @@ export const serverStore = defineStore("server", {
             serverRuntime.status = EnumServerStatus.STOPPING;
             const serverInfo = await this.serverInfo(server);
             serverInfo.logFile = serverRuntime.logFile;
-            await window.$mapi.server.stop(serverInfo);
+            await $mapi.server.stop(serverInfo);
         },
         async cancel(server: ServerRecord) {
             const record = this.findRecord(server);
@@ -343,7 +343,7 @@ export const serverStore = defineStore("server", {
             const serverRuntime = getOrCreateServerRuntime(server);
             const serverInfo = await this.serverInfo(server);
             serverInfo.logFile = serverRuntime.logFile;
-            await window.$mapi.server.cancel(serverInfo);
+            await $mapi.server.cancel(serverInfo);
         },
         async updateSetting(key: string, setting: any) {
             const record = this.records.find(record => record.key === key);
@@ -369,8 +369,10 @@ export const serverStore = defineStore("server", {
                     throw new Error("StatusError");
                 }
             }
+            const serverInfo = await this.serverInfo(server);
+            $mapi.server.deletes(serverInfo).then();
             if (record.type === EnumServerType.LOCAL) {
-                await window.$mapi.file.deletes(record.localPath as string, {
+                await $mapi.file.deletes(record.localPath as string, {
                     isDataPath: true,
                 });
             }
@@ -394,7 +396,7 @@ export const serverStore = defineStore("server", {
                 record.status = undefined;
                 record.runtime = undefined;
             });
-            await window.$mapi.storage.set("server", "records", savedRecords);
+            await $mapi.storage.set("server", "records", savedRecords);
         },
         async getByKey(key: string): Promise<ServerRecord | undefined> {
             // if (key.startsWith('Cloud')) {
@@ -424,7 +426,7 @@ export const serverStore = defineStore("server", {
             option?: ServerCallFunctionOption
         ): Promise<ServerCallFunctionResult> {
             await this.callStart(serverInfo);
-            const res = await window.$mapi.server.callFunctionWithException(serverInfo, method, data, option);
+            const res = await $mapi.server.callFunctionWithException(serverInfo, method, data, option);
             await this.callEnd(serverInfo);
             return res;
         },
@@ -459,7 +461,7 @@ export const serverStore = defineStore("server", {
                 config: JSON.parse(JSON.stringify(server)),
             };
             if (server.type === EnumServerType.LOCAL) {
-                result.localPath = await window.$mapi.file.fullPath(server.localPath as string);
+                result.localPath = await $mapi.file.fullPath(server.localPath as string);
             } else if (server.type === EnumServerType.LOCAL_DIR) {
                 result.localPath = server.localPath as string;
             } else if (server.type === EnumServerType.CLOUD) {