优化：错误细化显示

Author: modstart

electron/mapi/manager/plugin/index.ts

@@ -386,7 +386,7 @@ export const ManagerPlugin = {
     async refreshInstall(name: string) {
         const doc = await KVDBMain.get(CommonConfig.dbSystem, `${CommonConfig.dbPluginIdPrefix}/${name}`)
         if (!doc) {
-            throw `PluginNotFound : ${name}`
+            throw `PluginNotExists : ${name}`
         }
         const pluginInfo: PluginInfo = doc as any
         const root = pluginInfo.root
@@ -419,15 +419,15 @@ export const ManagerPlugin = {
     async uninstall(name: string) {
         const plugin = await this.get(name)
         if (!plugin) {
-            throw `PluginNotFound : ${name}`
+            throw `PluginNotExists:-1:${name}`
         }
         const pi = await KVDBMain.get(CommonConfig.dbSystem, `${CommonConfig.dbPluginIdPrefix}/${name}`)
         if (!pi) {
-            throw `PluginNotFound : ${name}`
+            throw `PluginNotExists:-2:${name}`
         }
         const info: PluginInfo = pi as any
         if (!info.name || !info.version || !info.type || !info.config) {
-            throw `PluginNotFound : ${name}`
+            throw `PluginNotExists:-3:${name}`
         }
         await ManagerBackend.run(plugin, 'hook', 'beforeUninstall', {})
         if (info.type === PluginType.STORE || info.type === PluginType.ZIP) {

electron/mapi/manager/system/plugin/store/index.ts

@@ -100,6 +100,9 @@ export const ManagerPluginStore = {
         if (!configJson) {
             throw 'PluginFormatError:-10'
         }
+        if (configJson['name'] !== pluginName) {
+            throw 'PluginFormatError:-11'
+        }
         const payload = {
             plugin: pluginName,
             version: option['version'],
@@ -197,15 +200,15 @@ export const ManagerPluginStore = {
             isFullPath: true,
         })
         if (!config) {
-            throw 'PluginFormatError:-11'
+            throw 'PluginFormatError:-12'
         }
         let configJson = null
         try {
             configJson = JSON.parse(config)
         } catch (e) {
         }
         if (!configJson) {
-            throw 'PluginFormatError:-12'
+            throw 'PluginFormatError:-13'
         }
         const payload = {
             plugin: pluginName,

src/lib/error.ts

@@ -16,10 +16,14 @@ export function mapError(msg: any) {
         if (msg.includes(key)) {
             let error = map[key]
             // regex PluginReleaseDocFormatError:-11
-            const regex = new RegExp(`${key}:(-?\\d+)`)
+            const regex = new RegExp(`${key}:(-?\\d+):?([\\w\\d]*)`)
             const match = msg.match(regex)
+            console.log('match', match)
             if (match) {
                 error += `(${match[1]})`
+                if (match[2]) {
+                    error += `(${match[2]})`
+                }
             }
             return error
         }