📦 Chore: update electron from v6 -> v16

src/main/apis/README.md

@@ -6,7 +6,7 @@ The lowest level APIs that are not dependent on each other. The upper APIs depen
 
 ## app
 
-Provide key API interfaces for PicGo application, including uploader, window management, shortcut key system, etc
+Provide key API interfaces for PicGo application, including uploader, window management, shortcut key system, remotes handler, etc
 
 ## gui
 

src/main/apis/app/shortKey/shortKeyHandler.ts

@@ -16,10 +16,12 @@ class ShortKeyHandler {
       this.isInModifiedMode = flag
     })
   }
+
   init () {
     this.initBuiltInShortKey()
     this.initPluginsShortKey()
   }
+
   private initBuiltInShortKey () {
     const commands = db.get('settings.shortKey') as IShortKeyConfigs
     Object.keys(commands)
@@ -34,10 +36,11 @@ class ShortKeyHandler {
         }
       })
   }
+
   private initPluginsShortKey () {
     // get enabled plugin
     const pluginList = picgo.pluginLoader.getList()
-    for (let item of pluginList) {
+    for (const item of pluginList) {
       const plugin = picgo.pluginLoader.getPlugin(item)
       // if a plugin has commands
       if (plugin && plugin.commands) {
@@ -46,7 +49,7 @@ class ShortKeyHandler {
           continue
         }
         const commands = plugin.commands(picgo) as IPluginShortKeyConfig[]
-        for (let cmd of commands) {
+        for (const cmd of commands) {
           const command = `${item}:${cmd.name}`
           if (db.has(`settings.shortKey[${command}]`)) {
             const commandConfig = db.get(`settings.shortKey.${command}`) as IShortKeyConfig
@@ -63,6 +66,7 @@ class ShortKeyHandler {
       }
     }
   }
+
   private registerShortKey (config: IShortKeyConfig | IPluginShortKeyConfig, command: string, handler: IShortKeyHandler, writeFlag: boolean) {
     shortKeyService.registerCommand(command, handler)
     if (config.key) {
@@ -85,6 +89,7 @@ class ShortKeyHandler {
       })
     }
   }
+
   // enable or disable shortKey
   bindOrUnbindShortKey (item: IShortKeyConfig, from: string): boolean {
     const command = `${from}:${item.name}`
@@ -108,6 +113,7 @@ class ShortKeyHandler {
       }
     }
   }
+
   // update shortKey bindings
   updateShortKey (item: IShortKeyConfig, oldKey: string, from: string): boolean {
     const command = `${from}:${item.name}`
@@ -121,6 +127,7 @@ class ShortKeyHandler {
     })
     return true
   }
+
   private async handler (command: string) {
     if (this.isInModifiedMode) {
       return
@@ -136,6 +143,7 @@ class ShortKeyHandler {
       logger.warn(`can not find command: ${command}`)
     }
   }
+
   registerPluginShortKey (pluginName: string) {
     const plugin = picgo.pluginLoader.getPlugin(pluginName)
     if (plugin && plugin.commands) {
@@ -144,7 +152,7 @@ class ShortKeyHandler {
         return
       }
       const commands = plugin.commands(picgo) as IPluginShortKeyConfig[]
-      for (let cmd of commands) {
+      for (const cmd of commands) {
         const command = `${pluginName}:${cmd.name}`
         if (db.has(`settings.shortKey[${command}]`)) {
           const commandConfig = db.get(`settings.shortKey[${command}]`) as IShortKeyConfig
@@ -155,6 +163,7 @@ class ShortKeyHandler {
       }
     }
   }
+
   unregisterPluginShortKey (pluginName: string) {
     const commands = db.get('settings.shortKey') as IShortKeyConfigs
     const keyList = Object.keys(commands)

src/main/apis/app/shortKey/shortKeyService.ts

@@ -4,15 +4,18 @@ class ShortKeyService {
   registerCommand (command: string, handler: IShortKeyHandler) {
     this.commandList.set(command, handler)
   }
+
   unregisterCommand (command: string) {
     this.commandList.delete(command)
   }
+
   getShortKeyHandler (command: string): IShortKeyHandler | null {
     const handler = this.commandList.get(command)
     if (handler) return handler
     logger.warn(`cannot find command: ${command}`)
     return null
   }
+
   getCommandList () {
     return [...this.commandList.keys()]
   }

src/main/apis/app/system/index.ts

@@ -13,7 +13,7 @@ import db, { GalleryDB } from '~/main/apis/core/datastore'
 import windowManager from 'apis/app/window/windowManager'
 import { IWindowList } from 'apis/app/window/constants'
 import picgo from '@core/picgo'
-import pasteTemplate from '#/utils/pasteTemplate'
+import pasteTemplate from '~/main/utils/pasteTemplate'
 import pkg from 'root/package.json'
 import { handleCopyUrl } from '~/main/utils/common'
 import { privacyManager } from '~/main/utils/privacyManager'
@@ -162,8 +162,8 @@ export function createTray () {
       if (process.platform === 'darwin') {
         toggleWindow(bounds)
         setTimeout(() => {
-          let img = clipboard.readImage()
-          let obj: ImgInfo[] = []
+          const img = clipboard.readImage()
+          const obj: ImgInfo[] = []
           if (!img.isEmpty()) {
             // 从剪贴板来的图片默认转为png
             // @ts-ignore

src/main/apis/app/uploader/apis.ts

@@ -5,13 +5,13 @@ import {
 import windowManager from 'apis/app/window/windowManager'
 import { IWindowList } from 'apis/app/window/constants'
 import uploader from '.'
-import pasteTemplate from '#/utils/pasteTemplate'
+import pasteTemplate from '~/main/utils/pasteTemplate'
 import db, { GalleryDB } from '~/main/apis/core/datastore'
 import { handleCopyUrl } from '~/main/utils/common'
 import { handleUrlEncode } from '#/utils/common'
 export const uploadClipboardFiles = async (): Promise<string> => {
   const win = windowManager.getAvailableWindow()
-  let img = await uploader.setWebContents(win!.webContents).upload()
+  const img = await uploader.setWebContents(win!.webContents).upload()
   if (img !== false) {
     if (img.length > 0) {
       const trayWindow = windowManager.get(IWindowList.TRAY_WINDOW)

src/main/apis/app/uploader/index.ts

@@ -16,7 +16,7 @@ import { TALKING_DATA_EVENT } from '~/universal/events/constants'
 import logger from '@core/picgo/logger'
 
 const waitForShow = (webcontent: WebContents) => {
-  return new Promise<void>((resolve, reject) => {
+  return new Promise<void>((resolve) => {
     webcontent.on('did-finish-load', () => {
       resolve()
     })
@@ -24,7 +24,7 @@ const waitForShow = (webcontent: WebContents) => {
 }
 
 const waitForRename = (window: BrowserWindow, id: number): Promise<string|null> => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     const windowId = window.id
     ipcMain.once(`rename${id}`, (evt: Event, newName: string) => {
       resolve(newName)
@@ -68,7 +68,7 @@ class Uploader {
     picgo.on('uploadProgress', progress => {
       this.webContents?.send('uploadProgress', progress)
     })
-    picgo.on('beforeTransform', ctx => {
+    picgo.on('beforeTransform', () => {
       if (db.get('settings.uploadNotification')) {
         const notification = new Notification({
           title: '上传进度',
@@ -125,7 +125,7 @@ class Uploader {
       } else {
         return false
       }
-    } catch (e) {
+    } catch (e: any) {
       logger.error(e)
       setTimeout(() => {
         showNotification({

src/main/apis/app/window/constants.ts

@@ -9,16 +9,16 @@ const isDevelopment = process.env.NODE_ENV !== 'production'
 
 export const TRAY_WINDOW_URL = isDevelopment
   ? (process.env.WEBPACK_DEV_SERVER_URL as string)
-  : `picgo://./index.html`
+  : 'picgo://./index.html'
 
 export const SETTING_WINDOW_URL = isDevelopment
   ? `${(process.env.WEBPACK_DEV_SERVER_URL as string)}#main-page/upload`
-  : `picgo://./index.html#main-page/upload`
+  : 'picgo://./index.html#main-page/upload'
 
 export const MINI_WINDOW_URL = isDevelopment
   ? `${(process.env.WEBPACK_DEV_SERVER_URL as string)}#mini-page`
-  : `picgo://./index.html#mini-page`
+  : 'picgo://./index.html#mini-page'
 
 export const RENAME_WINDOW_URL = process.env.NODE_ENV === 'development'
   ? `${(process.env.WEBPACK_DEV_SERVER_URL as string)}#rename-page`
-  : `picgo://./index.html#rename-page`
+  : 'picgo://./index.html#rename-page'

src/main/apis/app/window/windowList.ts

@@ -28,7 +28,8 @@ windowList.set(IWindowList.TRAY_WINDOW, {
       transparent: true,
       vibrancy: 'ultra-dark',
       webPreferences: {
-        nodeIntegration: true,
+        nodeIntegration: !!process.env.ELECTRON_NODE_INTEGRATION,
+        contextIsolation: !process.env.ELECTRON_NODE_INTEGRATION,
         nodeIntegrationInWorker: true,
         backgroundThrottling: false
       }
@@ -60,7 +61,8 @@ windowList.set(IWindowList.SETTING_WINDOW, {
       titleBarStyle: 'hidden',
       webPreferences: {
         backgroundThrottling: false,
-        nodeIntegration: true,
+        nodeIntegration: !!process.env.ELECTRON_NODE_INTEGRATION,
+        contextIsolation: !process.env.ELECTRON_NODE_INTEGRATION,
         nodeIntegrationInWorker: true,
         webSecurity: false
       }
@@ -93,7 +95,7 @@ windowList.set(IWindowList.MINI_WINDOW, {
   isValid: process.platform !== 'darwin',
   multiple: false,
   options () {
-    let obj: IBrowserWindowOptions = {
+    const obj: IBrowserWindowOptions = {
       height: 64,
       width: 64,
       show: process.platform === 'linux',
@@ -105,7 +107,8 @@ windowList.set(IWindowList.MINI_WINDOW, {
       icon: `${__static}/logo.png`,
       webPreferences: {
         backgroundThrottling: false,
-        nodeIntegration: true,
+        nodeIntegration: !!process.env.ELECTRON_NODE_INTEGRATION,
+        contextIsolation: !process.env.ELECTRON_NODE_INTEGRATION,
         nodeIntegrationInWorker: true
       }
     }
@@ -124,7 +127,7 @@ windowList.set(IWindowList.RENAME_WINDOW, {
   isValid: true,
   multiple: true,
   options () {
-    let options: IBrowserWindowOptions = {
+    const options: IBrowserWindowOptions = {
       height: 175,
       width: 300,
       show: true,
@@ -132,7 +135,8 @@ windowList.set(IWindowList.RENAME_WINDOW, {
       resizable: false,
       vibrancy: 'ultra-dark',
       webPreferences: {
-        nodeIntegration: true,
+        nodeIntegration: !!process.env.ELECTRON_NODE_INTEGRATION,
+        contextIsolation: !process.env.ELECTRON_NODE_INTEGRATION,
         nodeIntegrationInWorker: true,
         backgroundThrottling: false
       }

src/main/apis/app/window/windowManager.ts

@@ -34,6 +34,7 @@ class WindowManager implements IWindowManager {
       return null
     }
   }
+
   get (name: IWindowList) {
     if (this.has(name)) {
       return this.windowMap.get(name)!
@@ -42,9 +43,11 @@ class WindowManager implements IWindowManager {
       return window
     }
   }
+
   has (name: IWindowList) {
     return this.windowMap.has(name)
   }
+
   // useless
   // delete (name: IWindowList) {
   //   const window = this.windowMap.get(name)
@@ -60,6 +63,7 @@ class WindowManager implements IWindowManager {
       this.windowIdMap.delete(id)
     }
   }
+
   getAvailableWindow () {
     const miniWindow = this.windowMap.get(IWindowList.MINI_WINDOW)
     if (miniWindow && miniWindow.isVisible()) {

src/main/apis/core/bus/apis.ts

@@ -14,7 +14,7 @@ export const uploadWithClipboardFiles = (): Promise<{
   success: boolean,
   result?: string[]
 }> => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     bus.once(UPLOAD_WITH_CLIPBOARD_FILES_RESPONSE, (result: string) => {
       if (result) {
         return resolve({
@@ -35,7 +35,7 @@ export const uploadWithFiles = (pathList: IFileWithPath[]): Promise<{
   success: boolean,
   result?: string[]
 }> => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     bus.once(UPLOAD_WITH_FILES_RESPONSE, (result: string[]) => {
       if (result.length) {
         return resolve({
@@ -55,7 +55,7 @@ export const uploadWithFiles = (pathList: IFileWithPath[]): Promise<{
 // get available window id:
 // miniWindow or settingWindow or trayWindow
 export const getWindowId = (): Promise<number> => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     bus.once(GET_WINDOW_ID_REPONSE, (id: number) => {
       resolve(id)
     })
@@ -65,7 +65,7 @@ export const getWindowId = (): Promise<number> => {
 
 // get settingWindow id:
 export const getSettingWindowId = (): Promise<number> => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     bus.once(GET_SETTING_WINDOW_ID_RESPONSE, (id: number) => {
       resolve(id)
     })

src/main/apis/core/datastore/dbChecker.ts

@@ -1,9 +1,8 @@
 import fs from 'fs-extra'
 import path from 'path'
-import { remote, app } from 'electron'
-import dayjs from 'dayjs'
+import { app as APP } from 'electron'
 import { getLogger } from '@core/utils/localLogger'
-const APP = process.type === 'renderer' ? remote.app : app
+import dayjs from 'dayjs'
 const STORE_PATH = APP.getPath('userData')
 const configFilePath = path.join(STORE_PATH, 'data.json')
 const configFileBackupPath = path.join(STORE_PATH, 'data.bak.json')
@@ -36,7 +35,7 @@ function dbChecker () {
       return
     }
     let configFile: string = '{}'
-    let optionsTpl = {
+    const optionsTpl = {
       title: '注意',
       body: ''
     }
@@ -98,7 +97,7 @@ function dbPathChecker (): string {
     const picgoLogPath = path.join(defaultConfigPath, 'picgo.log')
     const logger = getLogger(picgoLogPath)
     if (!hasCheckPath) {
-      let optionsTpl = {
+      const optionsTpl = {
         title: '注意',
         body: '自定义文件解析出错，请检查路径内容是否正确'
       }

src/main/apis/core/datastore/index.ts

@@ -42,33 +42,42 @@ class ConfigStore {
       }).write()
     }
   }
+
   read () {
     return this.db.read()
   }
+
   get (key = '') {
     return this.read().get(key).value()
   }
+
   set (key: string, value: any) {
     return this.read().set(key, value).write()
   }
+
   has (key: string) {
     return this.read().has(key).value()
   }
+
   insert (key: string, value: any): void {
     // @ts-ignore
     return this.read().get(key).insert(value).write()
   }
+
   unset (key: string, value: any): boolean {
     return this.read().get(key).unset(value).value()
   }
+
   getById (key: string, id: string) {
     // @ts-ignore
     return this.read().get(key).getById(id).value()
   }
+
   removeById (key: string, id: string) {
     // @ts-ignore
     return this.read().get(key).removeById(id).write()
   }
+
   getConfigPath () {
     return CONFIG_PATH
   }
@@ -82,6 +91,7 @@ class GalleryDB {
   private constructor () {
     console.log('init gallery db')
   }
+
   public static getInstance (): DBStore {
     if (!GalleryDB.instance) {
       GalleryDB.instance = new DBStore(DB_PATH, 'gallery')

src/main/apis/gui/index.ts

@@ -8,7 +8,7 @@ import path from 'path'
 import db, { GalleryDB } from 'apis/core/datastore'
 import { dbPathChecker, defaultConfigPath, getGalleryDBPath } from 'apis/core/datastore/dbChecker'
 import uploader from 'apis/app/uploader'
-import pasteTemplate from '#/utils/pasteTemplate'
+import pasteTemplate from '~/main/utils/pasteTemplate'
 import { handleCopyUrl } from '~/main/utils/common'
 import {
   getWindowId,
@@ -28,20 +28,22 @@ class GuiApi implements IGuiApi {
   private constructor () {
     console.log('init guiapi')
   }
+
   public static getInstance (): GuiApi {
     if (!GuiApi.instance) {
       GuiApi.instance = new GuiApi()
     }
     return GuiApi.instance
   }
+
   private async showSettingWindow () {
     this.settingWindowId = await getSettingWindowId()
     const settingWindow = BrowserWindow.fromId(this.settingWindowId)
-    if (settingWindow.isVisible()) {
+    if (settingWindow?.isVisible()) {
       return true
     }
-    settingWindow.show()
-    return new Promise<void>((resolve, reject) => {
+    settingWindow?.show()
+    return new Promise<void>((resolve) => {
       setTimeout(() => {
         resolve()
       }, 1000) // TODO: a better way to wait page loaded.
@@ -49,7 +51,7 @@ class GuiApi implements IGuiApi {
   }
 
   private getWebcontentsByWindowId (id: number) {
-    return BrowserWindow.fromId(id).webContents
+    return BrowserWindow.fromId(id)?.webContents
   }
 
   async showInputBox (options: IShowInputBoxOption = {
@@ -57,28 +59,24 @@ class GuiApi implements IGuiApi {
     placeholder: ''
   }) {
     await this.showSettingWindow()
-    this.getWebcontentsByWindowId(this.settingWindowId)
-      .send(SHOW_INPUT_BOX, options)
-    return new Promise<string>((resolve, reject) => {
+    this.getWebcontentsByWindowId(this.settingWindowId)?.send(SHOW_INPUT_BOX, options)
+    return new Promise<string>((resolve) => {
       ipcMain.once(SHOW_INPUT_BOX, (event: Event, value: string) => {
         resolve(value)
       })
     })
   }
 
-  showFileExplorer (options: IShowFileExplorerOption = {}) {
-    return new Promise<string>(async (resolve, reject) => {
-      this.windowId = await getWindowId()
-      dialog.showOpenDialog(BrowserWindow.fromId(this.windowId), options, (filename: string) => {
-        resolve(filename)
-      })
-    })
+  async showFileExplorer (options: IShowFileExplorerOption = {}) {
+    this.windowId = await getWindowId()
+    const res = await dialog.showOpenDialog(BrowserWindow.fromId(this.windowId)!, options)
+    return res.filePaths?.[0]
   }
 
   async upload (input: IUploadOption) {
     this.windowId = await getWindowId()
     const webContents = this.getWebcontentsByWindowId(this.windowId)
-    const imgs = await uploader.setWebContents(webContents).upload(input)
+    const imgs = await uploader.setWebContents(webContents!).upload(input)
     if (imgs !== false) {
       const pasteStyle = db.get('settings.pasteStyle') || 'markdown'
       const pasteText: string[] = []
@@ -95,8 +93,8 @@ class GuiApi implements IGuiApi {
         await GalleryDB.getInstance().insert(imgs[i])
       }
       handleCopyUrl(pasteText.join('\n'))
-      webContents.send('uploadFiles', imgs)
-      webContents.send('updateGallery')
+      webContents?.send('uploadFiles', imgs)
+      webContents?.send('updateGallery')
       return imgs
     }
     return []
@@ -119,10 +117,10 @@ class GuiApi implements IGuiApi {
     type: 'info',
     buttons: ['Yes', 'No']
   }) {
-    return new Promise<IShowMessageBoxResult>(async (resolve, reject) => {
+    return new Promise<IShowMessageBoxResult>(async (resolve) => {
       this.windowId = await getWindowId()
       dialog.showMessageBox(
-        BrowserWindow.fromId(this.windowId),
+        BrowserWindow.fromId(this.windowId)!,
         options
       ).then((res) => {
         resolve({

src/main/events/busEventList.ts

@@ -28,7 +28,7 @@ function initEventCenter () {
     [GET_SETTING_WINDOW_ID]: busCallGetSettingWindowId,
     [CREATE_APP_MENU]: createMenu
   }
-  for (let i in eventList) {
+  for (const i in eventList) {
     bus.on(i, eventList[i])
   }
 }

src/main/events/ipcList.ts

@@ -1,13 +1,15 @@
 import {
   app,
   ipcMain,
+  shell,
   Notification,
-  IpcMainEvent
+  IpcMainEvent,
+  BrowserWindow
 } from 'electron'
 import windowManager from 'apis/app/window/windowManager'
 import { IWindowList } from 'apis/app/window/constants'
 import uploader from 'apis/app/uploader'
-import pasteTemplate from '#/utils/pasteTemplate'
+import pasteTemplate from '~/main/utils/pasteTemplate'
 import db, { GalleryDB } from '~/main/apis/core/datastore'
 import server from '~/main/server'
 import getPicBeds from '~/main/utils/getPicBeds'
@@ -15,7 +17,16 @@ import shortKeyHandler from 'apis/app/shortKey/shortKeyHandler'
 import bus from '@core/bus'
 import {
   TOGGLE_SHORTKEY_MODIFIED_MODE,
-  OPEN_DEVTOOLS
+  OPEN_DEVTOOLS,
+  SHOW_MINI_PAGE_MENU,
+  MINIMIZE_WINDOW,
+  CLOSE_WINDOW,
+  SHOW_MAIN_PAGE_MENU,
+  SHOW_UPLOAD_PAGE_MENU,
+  OPEN_USER_STORE_FILE,
+  OPEN_URL,
+  RELOAD_APP,
+  SHOW_PLUGIN_PAGE_MENU
 } from '#/events/constants'
 import {
   uploadClipboardFiles,
@@ -23,6 +34,10 @@ import {
 } from '~/main/apis/app/uploader/apis'
 import picgoCoreIPC from './picgoCoreIPC'
 import { handleCopyUrl } from '~/main/utils/common'
+import { buildMainPageMenu, buildMiniPageMenu, buildPluginPageMenu, buildUploadPageMenu } from './remotes/menu'
+import path from 'path'
+
+const STORE_PATH = app.getPath('userData')
 
 export default {
   listen () {
@@ -145,6 +160,58 @@ export default {
     ipcMain.on(OPEN_DEVTOOLS, (event: IpcMainEvent) => {
       event.sender.openDevTools()
     })
+    // menu & window methods
+    ipcMain.on(SHOW_MINI_PAGE_MENU, () => {
+      const window = windowManager.get(IWindowList.MINI_WINDOW)!
+      const menu = buildMiniPageMenu()
+      menu.popup({
+        window
+      })
+    })
+    ipcMain.on(SHOW_MAIN_PAGE_MENU, () => {
+      const window = windowManager.get(IWindowList.SETTING_WINDOW)!
+      const menu = buildMainPageMenu()
+      menu.popup({
+        window
+      })
+    })
+    ipcMain.on(SHOW_UPLOAD_PAGE_MENU, () => {
+      const window = windowManager.get(IWindowList.SETTING_WINDOW)!
+      const menu = buildUploadPageMenu()
+      menu.popup({
+        window
+      })
+    })
+    ipcMain.on(SHOW_PLUGIN_PAGE_MENU, (evt: IpcMainEvent, plugin: IPicGoPlugin) => {
+      const window = windowManager.get(IWindowList.SETTING_WINDOW)!
+      const menu = buildPluginPageMenu(plugin)
+      menu.popup({
+        window
+      })
+    })
+    ipcMain.on(MINIMIZE_WINDOW, () => {
+      const window = BrowserWindow.getFocusedWindow()
+      window?.minimize()
+    })
+    ipcMain.on(CLOSE_WINDOW, () => {
+      const window = BrowserWindow.getFocusedWindow()
+      if (process.platform === 'linux') {
+        window?.hide()
+      } else {
+        window?.close()
+      }
+    })
+    ipcMain.on(OPEN_USER_STORE_FILE, (evt: IpcMainEvent, filePath: string) => {
+      const abFilePath = path.join(STORE_PATH, filePath)
+      shell.openPath(abFilePath)
+    })
+    ipcMain.on(OPEN_URL, (evt: IpcMainEvent, url: string) => {
+      shell.openExternal(url)
+    })
+    ipcMain.on(RELOAD_APP, () => {
+      app.relaunch()
+      app.exit(0)
+    })
   },
   dispose () {}
 }

src/main/events/picgoCoreIPC.ts

@@ -4,10 +4,11 @@ import {
   dialog,
   shell,
   IpcMainEvent,
-  ipcMain
+  ipcMain,
+  clipboard
 } from 'electron'
 import PicGoCore from '~/universal/types/picgo'
-import { IPicGoHelperType } from '#/types/enum'
+import { IPasteStyle, IPicGoHelperType } from '#/types/enum'
 import shortKeyHandler from 'apis/app/shortKey/shortKeyHandler'
 import picgo from '@core/picgo'
 import { handleStreamlinePluginName } from '~/universal/utils/common'
@@ -25,11 +26,13 @@ import {
   PICGO_UPDATE_BY_ID_DB,
   PICGO_GET_BY_ID_DB,
   PICGO_REMOVE_BY_ID_DB,
-  PICGO_OPEN_FILE
+  PICGO_OPEN_FILE,
+  PASTE_TEXT
 } from '#/events/constants'
 
 import { GalleryDB } from 'apis/core/datastore'
 import { IObject, IFilter } from '@picgo/store/dist/types'
+import pasteTemplate from '../utils/pasteTemplate'
 
 // eslint-disable-next-line
 const requireFunc = typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require
@@ -37,11 +40,6 @@ const requireFunc = typeof __webpack_require__ === 'function' ? __non_webpack_re
 const STORE_PATH = path.dirname(dbPathChecker())
 // const CONFIG_PATH = path.join(STORE_PATH, '/data.json')
 
-type PicGoNotice = {
-  title: string,
-  body: string[]
-}
-
 interface GuiMenuItem {
   label: string
   handle: (arg0: PicGoCore, arg1: GuiApi) => Promise<void>
@@ -64,7 +62,7 @@ const getConfig = (name: string, type: IPicGoHelperType, ctx: PicGoCore) => {
 }
 
 const handleConfigWithFunction = (config: any[]) => {
-  for (let i in config) {
+  for (const i in config) {
     if (typeof config[i].default === 'function') {
       config[i].default = config[i].default()
     }
@@ -78,7 +76,7 @@ const handleConfigWithFunction = (config: any[]) => {
 const getPluginList = (): IPicGoPlugin[] => {
   const pluginList = picgo.pluginLoader.getFullList()
   const list = []
-  for (let i in pluginList) {
+  for (const i in pluginList) {
     const plugin = picgo.pluginLoader.getPlugin(pluginList[i])!
     const pluginPath = path.join(STORE_PATH, `/node_modules/${pluginList[i]}`)
     const pluginPKG = requireFunc(path.join(pluginPath, 'package.json'))
@@ -156,39 +154,37 @@ const handlePluginInstall = () => {
   })
 }
 
-const handlePluginUninstall = () => {
-  ipcMain.on('uninstallPlugin', async (event: IpcMainEvent, msg: string) => {
-    const dispose = handleNPMError()
-    const res = await picgo.pluginHandler.uninstall([msg])
-    if (res.success) {
-      event.sender.send('uninstallSuccess', res.body[0])
-      shortKeyHandler.unregisterPluginShortKey(res.body[0])
-    } else {
-      showNotification({
-        title: '插件卸载失败',
-        body: res.body as string
-      })
-    }
-    event.sender.send('hideLoading')
-    dispose()
-  })
+const handlePluginUninstall = async (fullName: string) => {
+  const window = windowManager.get(IWindowList.SETTING_WINDOW)!
+  const dispose = handleNPMError()
+  const res = await picgo.pluginHandler.uninstall([fullName])
+  if (res.success) {
+    window.webContents.send('uninstallSuccess', res.body[0])
+    shortKeyHandler.unregisterPluginShortKey(res.body[0])
+  } else {
+    showNotification({
+      title: '插件卸载失败',
+      body: res.body as string
+    })
+  }
+  window.webContents.send('hideLoading')
+  dispose()
 }
 
-const handlePluginUpdate = () => {
-  ipcMain.on('updatePlugin', async (event: IpcMainEvent, msg: string) => {
-    const dispose = handleNPMError()
-    const res = await picgo.pluginHandler.update([msg])
-    if (res.success) {
-      event.sender.send('updateSuccess', res.body[0])
-    } else {
-      showNotification({
-        title: '插件更新失败',
-        body: res.body as string
-      })
-    }
-    event.sender.send('hideLoading')
-    dispose()
-  })
+const handlePluginUpdate = async (fullName: string) => {
+  const window = windowManager.get(IWindowList.SETTING_WINDOW)!
+  const dispose = handleNPMError()
+  const res = await picgo.pluginHandler.update([fullName])
+  if (res.success) {
+    window.webContents.send('updateSuccess', res.body[0])
+  } else {
+    showNotification({
+      title: '插件更新失败',
+      body: res.body as string
+    })
+  }
+  window.webContents.send('hideLoading')
+  dispose()
 }
 
 const handleNPMError = (): IDispose => {
@@ -221,6 +217,7 @@ const handleGetPicBedConfig = () => {
   })
 }
 
+// TODO: remove it
 const handlePluginActions = () => {
   ipcMain.on('pluginActions', (event: IpcMainEvent, name: string, label: string) => {
     const plugin = picgo.pluginLoader.getPlugin(name)
@@ -257,29 +254,29 @@ const handlePicGoGetConfig = () => {
 }
 
 const handleImportLocalPlugin = () => {
-  ipcMain.on('importLocalPlugin', (event: IpcMainEvent) => {
+  ipcMain.on('importLocalPlugin', async (event: IpcMainEvent) => {
     const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)!
-    dialog.showOpenDialog(settingWindow, {
+    const res = await dialog.showOpenDialog(settingWindow, {
       properties: ['openDirectory']
-    }, async (filePath: string[]) => {
-      if (filePath.length > 0) {
-        const res = await picgo.pluginHandler.install(filePath)
-        if (res.success) {
-          const list = getPluginList()
-          event.sender.send('pluginList', list)
-          showNotification({
-            title: '导入插件成功',
-            body: ''
-          })
-        } else {
-          showNotification({
-            title: '导入插件失败',
-            body: res.body as string
-          })
-        }
-      }
-      event.sender.send('hideLoading')
     })
+    const filePaths = res.filePaths
+    if (filePaths.length > 0) {
+      const res = await picgo.pluginHandler.install(filePaths)
+      if (res.success) {
+        const list = getPluginList()
+        event.sender.send('pluginList', list)
+        showNotification({
+          title: '导入插件成功',
+          body: ''
+        })
+      } else {
+        showNotification({
+          title: '导入插件失败',
+          body: res.body as string
+        })
+      }
+    }
+    event.sender.send('hideLoading')
   })
 }
 
@@ -319,12 +316,22 @@ const handlePicGoGalleryDB = () => {
     const res = await dbStore.removeById(id)
     event.sender.send(PICGO_REMOVE_BY_ID_DB, res, callbackId)
   })
+
+  ipcMain.handle(PASTE_TEXT, async (item: ImgInfo, copy = true) => {
+    const pasteStyle = picgo.getConfig<IPasteStyle>('settings.pasteStyle') || IPasteStyle.MARKDOWN
+    const customLink = picgo.getConfig<string>('settings.customLink')
+    const txt = pasteTemplate(pasteStyle, item, customLink)
+    if (copy) {
+      clipboard.writeText(txt)
+    }
+    return txt
+  })
 }
 
 const handleOpenFile = () => {
   ipcMain.on(PICGO_OPEN_FILE, (event: IpcMainEvent, fileName: string) => {
     const abFilePath = path.join(STORE_PATH, fileName)
-    shell.openItem(abFilePath)
+    shell.openPath(abFilePath)
   })
 }
 
@@ -332,8 +339,6 @@ export default {
   listen () {
     handleGetPluginList()
     handlePluginInstall()
-    handlePluginUninstall()
-    handlePluginUpdate()
     handleGetPicBedConfig()
     handlePluginActions()
     handleRemoveFiles()
@@ -342,5 +347,8 @@ export default {
     handlePicGoGalleryDB()
     handleImportLocalPlugin()
     handleOpenFile()
-  }
+  },
+  // TODO: separate to single file
+  handlePluginUninstall,
+  handlePluginUpdate
 }

src/main/events/remotes/menu.ts

@@ -0,0 +1,286 @@
+import windowManager from 'apis/app/window/windowManager'
+import { IWindowList } from 'apis/app/window/constants'
+import { Menu, BrowserWindow, app, dialog } from 'electron'
+import getPicBeds from '~/main/utils/getPicBeds'
+import picgo from '@core/picgo'
+import {
+  uploadClipboardFiles
+} from '~/main/apis/app/uploader/apis'
+import { privacyManager } from '~/main/utils/privacyManager'
+import pkg from 'root/package.json'
+import GuiApi from 'apis/gui'
+import PicGoCore from '~/universal/types/picgo'
+import { PICGO_CONFIG_PLUGIN, PICGO_HANDLE_PLUGIN_ING, PICGO_TOGGLE_PLUGIN } from '~/universal/events/constants'
+import picgoCoreIPC from '~/main/events/picgoCoreIPC'
+
+interface GuiMenuItem {
+  label: string
+  handle: (arg0: PicGoCore, arg1: GuiApi) => Promise<void>
+}
+
+const buildMiniPageMenu = () => {
+  const picBeds = getPicBeds()
+  const current = picgo.getConfig('picBed.uploader')
+  const submenu = picBeds.filter(item => item.visible).map(item => {
+    return {
+      label: item.name,
+      type: 'radio',
+      checked: current === item.type,
+      click () {
+        picgo.saveConfig({
+          'picBed.current': item.type,
+          'picBed.uploader': item.type
+        })
+        if (windowManager.has(IWindowList.SETTING_WINDOW)) {
+          windowManager.get(IWindowList.SETTING_WINDOW)!.webContents.send('syncPicBed')
+        }
+      }
+    }
+  })
+  const template = [
+    {
+      label: '打开详细窗口',
+      click () {
+        windowManager.get(IWindowList.SETTING_WINDOW)!.show()
+        if (windowManager.has(IWindowList.MINI_WINDOW)) {
+          windowManager.get(IWindowList.MINI_WINDOW)!.hide()
+        }
+      }
+    },
+    {
+      label: '选择默认图床',
+      type: 'submenu',
+      submenu
+    },
+    {
+      label: '剪贴板图片上传',
+      click () {
+        uploadClipboardFiles()
+      }
+    },
+    {
+      label: '隐藏窗口',
+      click () {
+        BrowserWindow.getFocusedWindow()!.hide()
+      }
+    },
+    {
+      label: '隐私协议',
+      click () {
+        privacyManager.show(false)
+      }
+    },
+    {
+      label: '重启应用',
+      click () {
+        app.relaunch()
+        app.exit(0)
+      }
+    },
+    {
+      role: 'quit',
+      label: '退出'
+    }
+  ]
+  // @ts-ignore
+  return Menu.buildFromTemplate(template)
+}
+
+const buildMainPageMenu = () => {
+  const template = [
+    {
+      label: '关于',
+      click () {
+        dialog.showMessageBox({
+          title: 'PicGo',
+          message: 'PicGo',
+          detail: `Version: ${pkg.version}\nAuthor: Molunerfinn\nGithub: https://github.com/Molunerfinn/PicGo`
+        })
+      }
+    },
+    {
+      label: '赞助PicGo',
+      click () {
+        // TODO: show donation
+      }
+    },
+    {
+      label: '生成图床配置二维码',
+      click () {
+        // TODO: qrcode
+        // _this.qrcodeVisible = true
+      }
+    },
+    {
+      label: '隐私协议',
+      click () {
+        privacyManager.show(false)
+      }
+    }
+  ]
+  // @ts-ignore
+  return Menu.buildFromTemplate(template)
+}
+
+const buildUploadPageMenu = () => {
+  const picBeds = getPicBeds()
+  const currentPicBed = picgo.getConfig('picBed.uploader')
+  const submenu = picBeds.filter(item => item.visible).map(item => {
+    return {
+      label: item.name,
+      type: 'radio',
+      checked: currentPicBed === item.type,
+      click () {
+        picgo.saveConfig({
+          'picBed.current': item.type,
+          'picBed.uploader': item.type
+        })
+        if (windowManager.has(IWindowList.SETTING_WINDOW)) {
+          windowManager.get(IWindowList.SETTING_WINDOW)!.webContents.send('syncPicBed')
+        }
+      }
+    }
+  })
+  // @ts-ignore
+  return Menu.buildFromTemplate(submenu)
+}
+
+// TODO: separate to single file
+
+const handleRestoreState = (item: string, name: string): void => {
+  if (item === 'uploader') {
+    const current = picgo.getConfig('picBed.current')
+    if (current === name) {
+      picgo.saveConfig({
+        'picBed.current': 'smms',
+        'picBed.uploader': 'smms'
+      })
+    }
+  }
+  if (item === 'transformer') {
+    const current = picgo.getConfig('picBed.transformer')
+    if (current === name) {
+      picgo.saveConfig({
+        'picBed.transformer': 'path'
+      })
+    }
+  }
+}
+
+const buildPluginPageMenu = (plugin: IPicGoPlugin) => {
+  const menu = [{
+    label: '启用插件',
+    enabled: !plugin.enabled,
+    click () {
+      picgo.saveConfig({
+        [`picgoPlugins.${plugin.fullName}`]: true
+      })
+      const window = windowManager.get(IWindowList.SETTING_WINDOW)!
+      window.webContents.send(PICGO_TOGGLE_PLUGIN, plugin.fullName, true)
+    }
+  }, {
+    label: '禁用插件',
+    enabled: plugin.enabled,
+    click () {
+      picgo.saveConfig({
+        [`picgoPlugins.${plugin.fullName}`]: false
+      })
+      const window = windowManager.get(IWindowList.SETTING_WINDOW)!
+      window.webContents.send(PICGO_HANDLE_PLUGIN_ING, plugin.fullName)
+      window.webContents.send(PICGO_TOGGLE_PLUGIN, plugin.fullName, false)
+      if (plugin.config.transformer.name) {
+        handleRestoreState('transformer', plugin.config.transformer.name)
+      }
+      if (plugin.config.uploader.name) {
+        handleRestoreState('uploader', plugin.config.uploader.name)
+      }
+    }
+  }, {
+    label: '卸载插件',
+    click () {
+      const window = windowManager.get(IWindowList.SETTING_WINDOW)!
+      window.webContents.send(PICGO_HANDLE_PLUGIN_ING, plugin.fullName)
+      picgoCoreIPC.handlePluginUninstall(plugin.fullName)
+    }
+  }, {
+    label: '更新插件',
+    click () {
+      const window = windowManager.get(IWindowList.SETTING_WINDOW)!
+      window.webContents.send(PICGO_HANDLE_PLUGIN_ING, plugin.fullName)
+      picgoCoreIPC.handlePluginUpdate(plugin.fullName)
+    }
+  }]
+  for (const i in plugin.config) {
+    if (plugin.config[i].config.length > 0) {
+      const obj = {
+        label: `配置${i} - ${plugin.config[i].fullName || plugin.config[i].name}`,
+        click () {
+          const window = windowManager.get(IWindowList.SETTING_WINDOW)!
+          const currentType = i
+          const configName = plugin.config[i].fullName || plugin.config[i].name
+          const config = plugin.config[i].config
+          window.webContents.send(PICGO_CONFIG_PLUGIN, currentType, configName, config)
+        }
+      }
+      menu.push(obj)
+    }
+  }
+
+  // handle transformer
+  if (plugin.config.transformer.name) {
+    const currentTransformer = picgo.getConfig<string>('picBed.transformer') || 'path'
+    const pluginTransformer = plugin.config.transformer.name
+    const obj = {
+      label: `${currentTransformer === pluginTransformer ? '禁用' : '启用'}transformer - ${plugin.config.transformer.name}`,
+      click () {
+        const transformer = plugin.config.transformer.name
+        const currentTransformer = picgo.getConfig<string>('picBed.transformer') || 'path'
+        if (currentTransformer === transformer) {
+          picgo.saveConfig({
+            'picBed.transformer': 'path'
+          })
+        } else {
+          picgo.saveConfig({
+            'picBed.transformer': transformer
+          })
+        }
+      }
+    }
+    menu.push(obj)
+  }
+
+  // plugin custom menus
+  if (plugin.guiMenu) {
+    menu.push({
+      // @ts-ignore
+      type: 'separator'
+    })
+    for (const i of plugin.guiMenu) {
+      menu.push({
+        label: i.label,
+        click () {
+          // ipcRenderer.send('pluginActions', plugin.fullName, i.label)
+          const picgPlugin = picgo.pluginLoader.getPlugin(plugin.fullName)
+          if (picgPlugin?.guiMenu?.(picgo)?.length) {
+            const menu: GuiMenuItem[] = picgPlugin.guiMenu(picgo)
+            menu.forEach(item => {
+              if (item.label === i.label) {
+                item.handle(picgo, GuiApi.getInstance())
+              }
+            })
+          }
+        }
+      })
+    }
+  }
+
+  // @ts-ignore
+  return Menu.buildFromTemplate(menu)
+}
+
+export {
+  buildMiniPageMenu,
+  buildMainPageMenu,
+  buildUploadPageMenu,
+  buildPluginPageMenu
+}

src/main/lifeCycle/index.ts

@@ -66,6 +66,7 @@ class LifeCycle {
     updateShortKeyFromVersion212(db, db.get('settings.shortKey'))
     await migrateGalleryFromVersion230(db, GalleryDB.getInstance(), picgo)
   }
+
   private onReady () {
     const readyFunction = async () => {
       console.log('on ready')
@@ -74,7 +75,7 @@ class LifeCycle {
         // Install Vue Devtools
         try {
           await installExtension(VUEJS_DEVTOOLS)
-        } catch (e) {
+        } catch (e: any) {
           console.error('Vue Devtools failed to install:', e.toString())
         }
       }
@@ -110,6 +111,7 @@ class LifeCycle {
       readyFunction()
     }
   }
+
   private onRunning () {
     app.on('second-instance', (event, commandLine, workingDirectory) => {
       logger.info('detect second instance')
@@ -144,6 +146,7 @@ class LifeCycle {
       process.env.XDG_CURRENT_DESKTOP = 'Unity'
     }
   }
+
   private onQuit () {
     app.on('window-all-closed', () => {
       if (process.platform !== 'darwin') {
@@ -171,6 +174,7 @@ class LifeCycle {
       }
     }
   }
+
   async launchApp () {
     const gotTheLock = app.requestSingleInstanceLock()
     if (!gotTheLock) {

src/main/server/index.ts

@@ -29,6 +29,7 @@ class Server {
     }
     this.httpServer = http.createServer(this.handleRequest)
   }
+
   private checkIfConfigIsValid (config: IObj | undefined) {
     if (config && config.port && config.host && (config.enable !== undefined)) {
       return true
@@ -36,6 +37,7 @@ class Server {
       return false
     }
   }
+
   private handleRequest = (request: http.IncomingMessage, response: http.ServerResponse) => {
     if (request.method === 'POST') {
       if (!routers.getHandler(request.url!)) {
@@ -57,8 +59,8 @@ class Server {
         request.on('end', () => {
           try {
             postObj = (body === '') ? {} : JSON.parse(body)
-          } catch (err) {
-            logger.error(`[PicGo Server]`, err)
+          } catch (err: any) {
+            logger.error('[PicGo Server]', err)
             return handleResponse({
               response,
               body: {
@@ -67,7 +69,7 @@ class Server {
               }
             })
           }
-          logger.info(`[PicGo Server] get the request`, body)
+          logger.info('[PicGo Server] get the request', body)
           const handler = routers.getHandler(request.url!)
           handler!({
             ...postObj,
@@ -81,6 +83,7 @@ class Server {
       response.end()
     }
   }
+
   // port as string is a bug
   private listen = (port: number | string) => {
     logger.info(`[PicGo Server] is listening at ${port}`)
@@ -102,18 +105,21 @@ class Server {
       }
     })
   }
+
   startup () {
     console.log('startup', this.config.enable)
     if (this.config.enable) {
       this.listen(this.config.port)
     }
   }
+
   shutdown (hasStarted?: boolean) {
     this.httpServer.close()
     if (!hasStarted) {
       logger.info('[PicGo Server] shutdown')
     }
   }
+
   restart () {
     this.config = picgo.getConfig('settings.server')
     this.shutdown()

src/main/server/router.ts

@@ -4,6 +4,7 @@ class Router {
   get (url: string, callback: routeHandler): void {
     this.router.set(url, callback)
   }
+
   post (url: string, callback: routeHandler): void {
     this.router.set(url, callback)
   }

src/main/server/routerManager.ts

@@ -69,7 +69,7 @@ router.post('/upload', async ({
         })
       }
     }
-  } catch (err) {
+  } catch (err: any) {
     logger.error(err)
     handleResponse({
       response,

src/main/utils/beforeOpen.ts

@@ -33,7 +33,7 @@ function resolveMacWorkFlow () {
  * 初始化剪贴板生成图片的脚本
  */
 function resolveClipboardImageGenerator () {
-  let clipboardFiles = getClipboardFiles()
+  const clipboardFiles = getClipboardFiles()
   if (!fs.pathExistsSync(path.join(CONFIG_DIR, 'windows10.ps1'))) {
     clipboardFiles.forEach(item => {
       fs.copyFileSync(item.origin, item.dest)
@@ -46,8 +46,8 @@ function resolveClipboardImageGenerator () {
 
   function diffFilesAndUpdate (filePath1: string, filePath2: string) {
     try {
-      let file1 = fs.existsSync(filePath1) && fs.readFileSync(filePath1)
-      let file2 = fs.existsSync(filePath1) && fs.readFileSync(filePath2)
+      const file1 = fs.existsSync(filePath1) && fs.readFileSync(filePath1)
+      const file2 = fs.existsSync(filePath1) && fs.readFileSync(filePath2)
 
       if (!file1 || !file2 || !file1.equals(file2)) {
         fs.copyFileSync(filePath1, filePath2)
@@ -59,7 +59,7 @@ function resolveClipboardImageGenerator () {
   }
 
   function getClipboardFiles () {
-    let files = [
+    const files = [
       '/linux.sh',
       '/mac.applescript',
       '/windows.ps1',

src/main/utils/common.ts

@@ -34,7 +34,7 @@ export const showNotification = (options: IPrivateShowNotificationOption = {
 }
 
 export const showMessageBox = (options: any) => {
-  return new Promise<IShowMessageBoxResult>(async (resolve, reject) => {
+  return new Promise<IShowMessageBoxResult>(async (resolve) => {
     dialog.showMessageBox(
       options
     ).then((res) => {

src/main/utils/handleArgv.ts

@@ -39,7 +39,7 @@ const getUploadFiles = (argv = process.argv, cwd = process.cwd(), logger: Logger
             path: item
           }
         } else {
-          let tempPath = path.join(cwd, item)
+          const tempPath = path.join(cwd, item)
           if (fs.existsSync(tempPath)) {
             return {
               path: tempPath

src/main/utils/pasteTemplate.ts

@@ -0,0 +1,31 @@
+import { IPasteStyle } from '#/types/enum'
+
+const formatCustomLink = (customLink: string, item: ImgInfo) => {
+  const fileName = item.fileName!.replace(new RegExp(`\\${item.extname}$`), '')
+  const url = item.url || item.imgUrl
+  const formatObj = {
+    url,
+    fileName
+  }
+  const keys = Object.keys(formatObj) as ['url', 'fileName']
+  keys.forEach(item => {
+    if (customLink.indexOf(`$${item}`) !== -1) {
+      const reg = new RegExp(`\\$${item}`, 'g')
+      customLink = customLink.replace(reg, formatObj[item])
+    }
+  })
+  return customLink
+}
+
+export default (style: IPasteStyle, item: ImgInfo, customLink: string | undefined) => {
+  const url = item.url || item.imgUrl
+  const _customLink = customLink || '$url'
+  const tpl = {
+    markdown: `![](${url})`,
+    HTML: `<img src="${url}"/>`,
+    URL: url,
+    UBB: `[IMG]${url}[/IMG]`,
+    Custom: formatCustomLink(_customLink, item)
+  }
+  return tpl[style]
+}