🔨 Refactor: rebuild multi-config communication way

src/universal/types/enum.ts

@@ -52,4 +52,8 @@ export enum IRemoteNoticeTriggerCount {
  */
 export enum IRPCActionType {
   GET_PICBED_CONFIG_LIST = 'GET_PICBED_CONFIG_LIST',
+  DELETE_PICBED_CONFIG = 'DELETE_PICBED_CONFIG',
+  CHANGE_CURRENT_UPLOADER = 'CHANGE_CURRENT_UPLOADER',
+  SELECT_UPLOADER = 'SELECT_UPLOADER',
+  UPDATE_UPLOADER_CONFIG = 'UPDATE_UPLOADER_CONFIG',
 }

src/universal/types/extra-vue.d.ts

@@ -24,6 +24,7 @@ declare module 'vue/types/vue' {
     saveConfig(data: IObj | string, value?: any): void
     getConfig<T>(key?: string): Promise<T | undefined>
     setDefaultPicBed(picBed: string): void
+    triggerRPC<T> (action: import('~/universal/types/enum').IRPCActionType, ...args: any[]): Promise<T | null>
     defaultPicBed: string
     forceUpdate(): void
     sendToMain(channel: string, ...args: any[]): void

src/universal/types/rpc.d.ts

@@ -0,0 +1,4 @@
+type IGetUploaderConfigListArgs = [type: string]
+type IDeleteUploaderConfigArgs = [type: string, id: string]
+type ISelectUploaderConfigArgs = [type: string, id: string]
+type IUpdateUploaderConfigArgs = [type: string, id: string, config: IStringKeyMap]

src/universal/types/types.d.ts

@@ -414,8 +414,12 @@ interface IUploaderListItemMetaInfo {
 }
 
 interface IUploaderConfig { 
-  [picBedType: string]: {
-    configList: (IStringKeyMap & IUploaderListItemMetaInfo)[]
-    defaultId: string
-  }
+  [picBedType: string]: IUploaderConfigItem
 }
+
+interface IUploaderConfigItem {
+  configList: IUploaderConfigListItem[]
+  defaultId: string
+}
+
+type IUploaderConfigListItem = IStringKeyMap & IUploaderListItemMetaInfo

src/universal/utils/handleUploaderConfig.ts

@@ -14,7 +14,7 @@ export const handleConfigWithFunction = (config: IPicGoPluginOriginConfig[]): IP
   return config as IPicGoPluginConfig[]
 }
 
-export const completeUploaderMetaConfig = (originData: IStringKeyMap): IStringKeyMap => {
+export const completeUploaderMetaConfig = (originData: IStringKeyMap): IUploaderConfigListItem => {
   return Object.assign({
     _configName: 'Default'
   }, trimValues(originData), {
@@ -46,8 +46,8 @@ export const getPicBedConfig = (type: string) => {
   }
 }
 
-export const changeCurrentUploader = (type: string, config: IStringKeyMap, id?: string) => {
-  if (!type || !config) {
+export const changeCurrentUploader = (type: string, config?: IStringKeyMap, id?: string) => {
+  if (!type) {
     return
   }
   if (id) {
@@ -55,16 +55,37 @@ export const changeCurrentUploader = (type: string, config: IStringKeyMap, id?:
       [`uploader.${type}.defaultId`]: id
     })
   }
+  if (config) {
+    picgo.saveConfig({
+      [`picBed.${type}`]: config
+    })
+  }
   picgo.saveConfig({
     'picBed.current': type,
-    'picBed.uploader': type,
-    [`picBed.${type}`]: config
+    'picBed.uploader': type
   })
 }
 
-export const getUploaderConfigList = (type: string) => {
+export const selectUploaderConfig = (type: string, id: string) => {
+  const { configList } = getUploaderConfigList(type)
+  const config = configList.find((item: IStringKeyMap) => item._id === id)
+  if (config) {
+    picgo.saveConfig({
+      [`uploader.${type}.defaultId`]: id,
+      [`picBed.${type}`]: config
+    })
+  }
+}
+
+export const getUploaderConfigList = (type: string): IUploaderConfigItem => {
+  if (!type) {
+    return {
+      configList: [],
+      defaultId: ''
+    }
+  }
   const currentUploaderConfig = picgo.getConfig<IStringKeyMap>(`uploader.${type}`) ?? {}
-  let configList = currentUploaderConfig.configList || []
+  let configList = currentUploaderConfig.configList
   let defaultId = currentUploaderConfig.defaultId || ''
   if (!configList) {
     const res = upgradeUploaderConfig(type)
@@ -80,18 +101,24 @@ export const getUploaderConfigList = (type: string) => {
 /**
  * delete uploader config by type & id
  */
-export const deleteUploaderConfig = (type: string, id: string) => {
+export const deleteUploaderConfig = (type: string, id: string): IUploaderConfigItem | void => {
   const { configList, defaultId } = getUploaderConfigList(type)
   if (configList.length <= 1) {
     return
   }
+  let newDefaultId = defaultId
   const updatedConfigList = configList.filter((item: IStringKeyMap) => item._id !== id)
   if (id === defaultId) {
+    newDefaultId = updatedConfigList[0]._id
     changeCurrentUploader(type, updatedConfigList[0], updatedConfigList[0]._id)
   }
   picgo.saveConfig({
     [`uploader.${type}.configList`]: updatedConfigList
   })
+  return {
+    configList: updatedConfigList,
+    defaultId: newDefaultId
+  }
 }
 
 /**
@@ -119,3 +146,24 @@ export const upgradeUploaderConfig = (type: string): {
     defaultId: uploaderConfig._id
   }
 }
+
+export const updateUploaderConfig = (type: string, id: string, config: IStringKeyMap) => {
+  const { configList, defaultId } = getUploaderConfigList(type)
+  const existConfig = configList.find((item: IStringKeyMap) => item._id === id)
+  let updatedConfig: IUploaderConfigListItem
+  let updatedDefaultId = defaultId
+  if (existConfig) {
+    updatedConfig = Object.assign(existConfig, trimValues(config), {
+      _updatedAt: Date.now()
+    })
+  } else {
+    updatedConfig = completeUploaderMetaConfig(config)
+    updatedDefaultId = updatedConfig._id
+    configList.push(updatedConfig)
+  }
+  picgo.saveConfig({
+    [`uploader.${type}.configList`]: configList,
+    [`uploader.${type}.defaultId`]: updatedDefaultId,
+    [`picBed.${type}`]: updatedConfig
+  })
+}