🎉 Release: v2.3.0-beta.6

🐛 Fix: disable plugin need reload app
✨ Feature: add logs for picgo-server
2024-04-21 10:31:33 +00:00 · 2021-04-24 18:12:46 +08:00 · 2021-04-24 18:11:50 +08:00 · 2021-04-24 17:56:56 +08:00 · 2021-04-24 12:14:15 +08:00 · 2021-04-24 00:44:49 +08:00
28 changed files with 483 additions and 98 deletions
@@ -15,7 +15,9 @@ module.exports = {
  'plugins': ['@typescript-eslint'],
  rules: {
    'no-console': process.env.NODE_ENV === 'production' ? 'off' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    "indent": "off",
+    "@typescript-eslint/indent": ["error", 2]
  },
  parserOptions: {
    parser: '@typescript-eslint/parser'
@@ -1,3 +1,30 @@
+# :tada: 2.3.0-beta.6 (2021-04-24)
+
+
+### :sparkles: Features
+
+* add baidu tongji for analytics ([f536391](https://github.com/Molunerfinn/PicGo/commit/f536391))
+* add logs for picgo-server ([2d9e9c0](https://github.com/Molunerfinn/PicGo/commit/2d9e9c0)), closes [#627](https://github.com/Molunerfinn/PicGo/issues/627)
+* add privacy policy ([992ff35](https://github.com/Molunerfinn/PicGo/commit/992ff35))
+
+
+### :bug: Bug Fixes
+
+* add plugin install failed notice ([b05139f](https://github.com/Molunerfinn/PicGo/commit/b05139f))
+* default picBed using picBed.uploader instead of picBed.current ([0a986c8](https://github.com/Molunerfinn/PicGo/commit/0a986c8))
+* dev error with install vue-devtools ([a657c51](https://github.com/Molunerfinn/PicGo/commit/a657c51)), closes [#653](https://github.com/Molunerfinn/PicGo/issues/653) [#658](https://github.com/Molunerfinn/PicGo/issues/658)
+* disable plugin need reload app ([a1b70b4](https://github.com/Molunerfinn/PicGo/commit/a1b70b4))
+* fix analytics value ([06d40ef](https://github.com/Molunerfinn/PicGo/commit/06d40ef))
+* windows cli uploading bug ([321e339](https://github.com/Molunerfinn/PicGo/commit/321e339)), closes [#657](https://github.com/Molunerfinn/PicGo/issues/657)
+
+
+### :package: Chore
+
+* add main process hot reload ([3fd6e4e](https://github.com/Molunerfinn/PicGo/commit/3fd6e4e))
+* fix eslint error notice in indent ([69e1dc8](https://github.com/Molunerfinn/PicGo/commit/69e1dc8))
+
+
+
 # :tada: 2.3.0-beta.5 (2021-04-04)


@@ -1,6 +1,6 @@
 {
  "name": "picgo",
-  "version": "2.3.0-beta.5",
+  "version": "2.3.0-beta.6",
  "private": true,
  "scripts": {
    "dev": "vue-cli-service electron:serve",
@@ -68,6 +68,7 @@
    "conventional-changelog": "^3.1.18",
    "cz-customizable": "^6.2.0",
    "electron": "^6.0.0",
+    "electron-devtools-installer": "^3.2.0",
    "eslint": "^5.16.0",
    "eslint-plugin-vue": "^5.0.0",
    "husky": "^3.1.0",
@@ -9,6 +9,7 @@ import VueLazyLoad from 'vue-lazyload'
 import axios from 'axios'
 import mainMixin from './renderer/utils/mainMixin'
 import bus from '@/utils/bus'
+import { initTalkingData } from './renderer/utils/analytics'

 webFrame.setVisualZoomLevelLimits(1, 1)
 webFrame.setLayoutZoomLevelLimits(0, 0)
@@ -36,3 +37,5 @@ new Vue({
  router,
  render: h => h(App)
 }).$mount('#app')
+
+initTalkingData()
@@ -16,6 +16,7 @@ import picgo from '@core/picgo'
 import pasteTemplate from '#/utils/pasteTemplate'
 import pkg from 'root/package.json'
 import { handleCopyUrl } from '~/main/utils/common'
+import { privacyManager } from '~/main/utils/privacyManager'
 let contextMenu: Menu | null
 let menu: Menu | null
 let tray: Tray | null
@@ -76,6 +77,12 @@ export function createContextMenu () {
          db.set('settings.showUpdateTip', !value)
        }
      },
+      {
+        label: '隐私协议',
+        click () {
+          privacyManager.show(false)
+        }
+      },
      {
        label: '重启应用',
        click () {
@@ -11,7 +11,9 @@ import windowManager from 'apis/app/window/windowManager'
 import { IWindowList } from 'apis/app/window/constants'
 import util from 'util'
 import { IPicGo } from 'picgo/dist/src/types'
-import { showNotification } from '~/main/utils/common'
+import { showNotification, calcDurationRange } from '~/main/utils/common'
+import { TALKING_DATA_EVENT } from '~/universal/events/constants'
+import logger from '@core/picgo/logger'

 const waitForShow = (webcontent: WebContents) => {
  return new Promise<void>((resolve, reject) => {
@@ -36,6 +38,20 @@ const waitForRename = (window: BrowserWindow, id: number): Promise<string|null>
  })
 }

+const handleTalkingData = (webContents: WebContents, options: IAnalyticsData) => {
+  const data: ITalkingDataOptions = {
+    EventId: 'upload',
+    Label: options.type,
+    MapKv: {
+      by: options.fromClipboard ? 'clipboard' : 'files', // 上传剪贴板图片还是选择的文文件
+      count: options.count, // 上传的数量
+      duration: calcDurationRange(options.duration || 0), // 上传耗时
+      type: options.type
+    }
+  }
+  webContents.send(TALKING_DATA_EVENT, data)
+}
+
 class Uploader {
  private webContents: WebContents | null = null
  private uploading: boolean = false
@@ -92,7 +108,7 @@ class Uploader {
    return this
  }

-  upload (img?: IUploadOption): Promise<ImgInfo[]|false> {
+  async upload (img?: IUploadOption): Promise<ImgInfo[]|false> {
    if (this.uploading) {
      showNotification({
        title: '上传失败',
@@ -100,38 +116,36 @@ class Uploader {
      })
      return Promise.resolve(false)
    }
-    return new Promise((resolve) => {
-      try {
-        this.uploading = true
-        picgo.upload(img)
-        picgo.once('finished', ctx => {
-          this.uploading = false
-          if (ctx.output.every((item: ImgInfo) => item.imgUrl)) {
-            resolve(ctx.output)
-          } else {
-            resolve(false)
-          }
-          picgo.removeAllListeners('failed')
-        })
-        picgo.once('failed', (e: Error) => {
-          this.uploading = false
-          setTimeout(() => {
-            showNotification({
-              title: '上传失败',
-              body: util.format(e.stack),
-              clickToCopy: true
-            })
-          }, 500)
-          picgo.removeAllListeners('finished')
-          resolve(false)
-        })
-      } catch (e) {
-        this.uploading = false
-        picgo.removeAllListeners('failed')
-        picgo.removeAllListeners('finished')
-        resolve([])
+    try {
+      const startTime = Date.now()
+      this.uploading = true
+      const output = await picgo.upload(img)
+      this.uploading = false
+      if (Array.isArray(output) && output.every((item: ImgInfo) => item.imgUrl)) {
+        if (this.webContents) {
+          handleTalkingData(this.webContents, {
+            fromClipboard: !img,
+            type: db.get('picBed.current') || 'smms',
+            count: img ? img.length : 1,
+            duration: Date.now() - startTime
+          } as IAnalyticsData)
+        }
+        return output
+      } else {
+        return false
      }
-    })
+    } catch (e) {
+      this.uploading = false
+      logger.error(e)
+      setTimeout(() => {
+        showNotification({
+          title: '上传失败',
+          body: util.format(e.stack),
+          clickToCopy: true
+        })
+      }, 500)
+      return false
+    }
  }
 }

@@ -13,7 +13,9 @@ import server from '~/main/server'
 import getPicBeds from '~/main/utils/getPicBeds'
 import shortKeyHandler from 'apis/app/shortKey/shortKeyHandler'
 import bus from '@core/bus'
-import { TOGGLE_SHORTKEY_MODIFIED_MODE } from '#/events/constants'
+import {
+  TOGGLE_SHORTKEY_MODIFIED_MODE
+} from '#/events/constants'
 import {
  uploadClipboardFiles,
  uploadChoosedFiles
@@ -121,12 +121,21 @@ const handleGetPluginList = () => {
 }

 const handlePluginInstall = () => {
-  ipcMain.on('installPlugin', async (event: IpcMainEvent, msg: string) => {
+  ipcMain.on('installPlugin', async (event: IpcMainEvent, fullName: string) => {
    const dispose = handleNPMError()
-    const res = await picgo.pluginHandler.install([msg])
+    const res = await picgo.pluginHandler.install([fullName])
+    event.sender.send('installPlugin', {
+      success: res.success,
+      body: fullName,
+      errMsg: res.success ? '' : res.body
+    })
    if (res.success) {
-      event.sender.send('installSuccess', res.body[0])
      shortKeyHandler.registerPluginShortKey(res.body[0])
+    } else {
+      showNotification({
+        title: '插件安装失败',
+        body: res.body as string
+      })
    }
    event.sender.send('hideLoading')
    dispose()
@@ -140,6 +149,11 @@ const handlePluginUninstall = () => {
    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()
@@ -152,6 +166,11 @@ const handlePluginUpdate = () => {
    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()
@@ -0,0 +1,33 @@
+import { app } from 'electron'
+import fse from 'fs-extra'
+import path from 'path'
+import dayjs from 'dayjs'
+import util from 'util'
+const STORE_PATH = app.getPath('userData')
+const LOG_PATH = path.join(STORE_PATH, '/picgo.log')
+
+// since the error may occur in picgo-core
+// so we can't use the log from picgo
+const loggerWriter = (error: Error) => {
+  let log = `${dayjs().format('YYYY-MM-DD HH:mm:ss')} [PicGo ERROR] startup error`
+  if (error?.stack) {
+    log += `\n------Error Stack Begin------\n${util.format(error.stack)}\n-------Error Stack End-------\n`
+  } else {
+    const msg = JSON.stringify(error)
+    log += `${msg}\n`
+  }
+  fse.appendFileSync(LOG_PATH, log)
+}
+
+const handleProcessError = (error: Error) => {
+  console.error(error)
+  loggerWriter(error)
+}
+
+process.on('uncaughtException', error => {
+  handleProcessError(error)
+})
+
+process.on('unhandledRejection', (error: any) => {
+  handleProcessError(error)
+})
@@ -1,14 +1,14 @@
+import './errorHandler'
 import {
  app,
  globalShortcut,
  protocol,
-  dialog,
  Notification
 } from 'electron'
 import {
-  createProtocol,
-  installVueDevtools
+  createProtocol
 } from 'vue-cli-plugin-electron-builder/lib'
+import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer'
 import beforeOpen from '~/main/utils/beforeOpen'
 import fixPath from 'fix-path'
 import ipcList from '~/main/events/ipcList'
@@ -31,8 +31,28 @@ import shortKeyHandler from 'apis/app/shortKey/shortKeyHandler'
 import { getUploadFiles } from '~/main/utils/handleArgv'
 import db from '#/datastore'
 import bus from '@core/bus'
+import { privacyManager } from '~/main/utils/privacyManager'
+import logger from 'apis/core/picgo/logger'

 const isDevelopment = process.env.NODE_ENV !== 'production'
+
+const handleStartUpFiles = (argv: string[], cwd: string) => {
+  const files = getUploadFiles(argv, cwd, logger)
+  if (files === null || files.length > 0) { // 如果有文件列表作为参数，说明是命令行启动
+    if (files === null) {
+      logger.info('cli -> uploading file from clipboard')
+      uploadClipboardFiles()
+    } else {
+      logger.info('cli -> uploading files from cli', ...files.map(item => item.path))
+      const win = windowManager.getAvailableWindow()
+      uploadChoosedFiles(win.webContents, files)
+    }
+    return true
+  } else {
+    return false
+  }
+}
+
 class LifeCycle {
  private beforeReady () {
    protocol.registerSchemesAsPrivileged([{ scheme: 'picgo', privileges: { secure: true, standard: true } }])
@@ -49,11 +69,15 @@ class LifeCycle {
      if (isDevelopment && !process.env.IS_TEST) {
        // Install Vue Devtools
        try {
-          await installVueDevtools()
+          await installExtension(VUEJS_DEVTOOLS)
        } catch (e) {
          console.error('Vue Devtools failed to install:', e.toString())
        }
      }
+      const res = await privacyManager.init()
+      if (!res) {
+        return app.quit()
+      }
      windowManager.create(IWindowList.TRAY_WINDOW)
      windowManager.create(IWindowList.SETTING_WINDOW)
      createTray()
@@ -65,15 +89,7 @@ class LifeCycle {
      })
      server.startup()
      if (process.env.NODE_ENV !== 'development') {
-        let files = getUploadFiles()
-        if (files === null || files.length > 0) { // 如果有文件列表作为参数，说明是命令行启动
-          if (files === null) {
-            uploadClipboardFiles()
-          } else {
-            const win = windowManager.getAvailableWindow()
-            uploadChoosedFiles(win.webContents, files)
-          }
-        }
+        handleStartUpFiles(process.argv, process.cwd())
      }

      if (global.notificationList?.length > 0) {
@@ -87,15 +103,9 @@ class LifeCycle {
  }
  private onRunning () {
    app.on('second-instance', (event, commandLine, workingDirectory) => {
-      let files = getUploadFiles(commandLine, workingDirectory)
-      if (files === null || files.length > 0) { // 如果有文件列表作为参数，说明是命令行启动
-        if (files === null) {
-          uploadClipboardFiles()
-        } else {
-          const win = windowManager.getAvailableWindow()
-          uploadChoosedFiles(win.webContents, files)
-        }
-      } else {
+      logger.info('detect second instance')
+      const result = handleStartUpFiles(commandLine, workingDirectory)
+      if (!result) {
        if (windowManager.has(IWindowList.SETTING_WINDOW)) {
          const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)!
          if (settingWindow.isMinimized()) {
@@ -143,13 +153,11 @@ class LifeCycle {
        process.on('message', data => {
          if (data === 'graceful-exit') {
            app.quit()
-            server.shutdown()
          }
        })
      } else {
        process.on('SIGTERM', () => {
          app.quit()
-          server.shutdown()
        })
      }
    }
@@ -20,6 +20,7 @@ const updateShortKeyFromVersion212 = (db: typeof DB, shortKeyConfig: IShortKeyCo
      name: 'upload',
      label: '快捷上传'
    }
+    // @ts-ignore
    delete shortKeyConfig.upload
    db.set('settings.shortKey', shortKeyConfig)
    return true
@@ -39,6 +39,7 @@ class Server {
  private handleRequest = (request: http.IncomingMessage, response: http.ServerResponse) => {
    if (request.method === 'POST') {
      if (!routers.getHandler(request.url!)) {
+        logger.warn(`[PicGo Server] don't support [${request.url}] url`)
        handleResponse({
          response,
          statusCode: 404,
@@ -57,6 +58,7 @@ class Server {
          try {
            postObj = (body === '') ? {} : JSON.parse(body)
          } catch (err) {
+            logger.error(`[PicGo Server]`, err)
            return handleResponse({
              response,
              body: {
@@ -65,6 +67,7 @@ class Server {
              }
            })
          }
+          logger.info(`[PicGo Server] get the request`)
          const handler = routers.getHandler(request.url!)
          handler!({
            ...postObj,
@@ -73,6 +76,7 @@ class Server {
        })
      }
    } else {
+      logger.warn(`[PicGo Server] don't support [${request.method}] method`)
      response.statusCode = 404
      response.end()
    }
@@ -18,6 +18,7 @@ router.post('/upload', async ({
  try {
    if (list.length === 0) {
      // upload with clipboard
+      logger.info('[PicGo Server] upload clipboard file')
      const res = await uploadWithClipboardFiles()
      if (res.success) {
        handleResponse({
@@ -29,10 +30,15 @@ router.post('/upload', async ({
        })
      } else {
        handleResponse({
-          response
+          response,
+          body: {
+            success: false,
+            message: 'upload error'
+          }
        })
      }
    } else {
+      logger.info('[PicGo Server] upload files in list')
      //  upload with files
      const pathList = list.map(item => {
        return {
@@ -50,7 +56,11 @@ router.post('/upload', async ({
        })
      } else {
        handleResponse({
-          response
+          response,
+          body: {
+            success: false,
+            message: 'upload error'
+          }
        })
      }
    }
@@ -1,3 +1,5 @@
+import logger from '@core/picgo/logger'
+
 export const handleResponse = ({
  response,
  statusCode = 200,
@@ -13,6 +15,9 @@ export const handleResponse = ({
  header?: IObj,
  body?: any
 }) => {
+  if (body?.success === false) {
+    logger.warn('[PicGo Server] upload failed, see picgo.log for more detail ↑')
+  }
  response.writeHead(statusCode, header)
  response.write(JSON.stringify(body))
  response.end()
@@ -1,5 +1,5 @@
 import db from '#/datastore'
-import { clipboard, Notification } from 'electron'
+import { clipboard, Notification, dialog } from 'electron'

 export const handleCopyUrl = (str: string): void => {
  if (db.get('settings.autoCopy') !== false) {
@@ -18,7 +18,8 @@ export const showNotification = (options: IPrivateShowNotificationOption = {
 }) => {
  const notification = new Notification({
    title: options.title,
-    body: options.body
+    body: options.body,
+    icon: options.icon || undefined
  })
  const handleClick = () => {
    if (options.clickToCopy) {
@@ -31,3 +32,40 @@ export const showNotification = (options: IPrivateShowNotificationOption = {
  })
  notification.show()
 }
+
+export const showMessageBox = (options: any) => {
+  return new Promise<IShowMessageBoxResult>(async (resolve, reject) => {
+    dialog.showMessageBox(
+      options
+    ).then((res) => {
+      resolve({
+        result: res.response,
+        checkboxChecked: res.checkboxChecked
+      })
+    })
+  })
+}
+
+export const calcDurationRange = (duration: number) => {
+  if (duration < 1000) {
+    return 500
+  } else if (duration < 1500) {
+    return 1000
+  } else if (duration < 3000) {
+    return 2000
+  } else if (duration < 5000) {
+    return 3000
+  } else if (duration < 7000) {
+    return 5000
+  } else if (duration < 10000) {
+    return 8000
+  } else if (duration < 12000) {
+    return 10000
+  } else if (duration < 20000) {
+    return 15000
+  } else if (duration < 30000) {
+    return 20000
+  }
+  // max range
+  return 100000
+}
@@ -1,35 +1,55 @@
 import path from 'path'
 import fs from 'fs-extra'
-type ClipboardFileObject = {
+import Logger from 'picgo/dist/src/lib/Logger'
+interface IResultFileObject {
  path: string
 }
-type Result = ClipboardFileObject[]
-const getUploadFiles = (argv = process.argv, cwd = process.cwd()) => {
-  let files = argv.slice(1)
-  if (files.length > 0 && files[0] === 'upload') {
-    if (files.length === 1) {
+type Result = IResultFileObject[]
+
+interface IHandleArgvResult {
+  success: boolean
+  fileList?: string[]
+}
+
+const handleArgv = (argv: string[]): IHandleArgvResult => {
+  const uploadIndex = argv.indexOf('upload')
+  if (uploadIndex !== -1) {
+    const fileList = argv.slice(1 + uploadIndex)
+    return {
+      success: true,
+      fileList
+    }
+  }
+  return {
+    success: false
+  }
+}
+
+const getUploadFiles = (argv = process.argv, cwd = process.cwd(), logger: Logger) => {
+  const { success, fileList } = handleArgv(argv)
+  if (!success) {
+    return []
+  } else {
+    if (fileList?.length === 0) {
      return null // for uploading images in clipboard
-    } else if (files.length > 1) {
-      files = argv.slice(1)
-      let result: Result = []
-      if (files.length > 0) {
-        result = files.map(item => {
-          if (path.isAbsolute(item)) {
+    } else if ((fileList?.length || 0) > 0) {
+      const result = fileList!.map(item => {
+        if (path.isAbsolute(item)) {
+          return {
+            path: item
+          }
+        } else {
+          let tempPath = path.join(cwd, item)
+          if (fs.existsSync(tempPath)) {
            return {
-              path: item
+              path: tempPath
            }
          } else {
-            let tempPath = path.join(cwd, item)
-            if (fs.existsSync(tempPath)) {
-              return {
-                path: tempPath
-              }
-            } else {
-              return null
-            }
+            logger.warn(`cli -> can't get file: ${tempPath}, invalid path`)
+            return null
          }
-        }).filter(item => item !== null) as Result
-      }
+        }
+      }).filter(item => item !== null) as Result
      return result
    }
  }
@@ -0,0 +1,61 @@
+import db from '#/datastore'
+import { ipcMain } from 'electron'
+import { showMessageBox } from '~/main/utils/common'
+import { SHOW_PRIVACY_MESSAGE } from '~/universal/events/constants'
+
+class PrivacyManager {
+  async init () {
+    ipcMain.on(SHOW_PRIVACY_MESSAGE, () => {
+      this.show(false)
+    })
+    if (db.get('settings.privacyEnsure') !== true) {
+      const res = await this.show(true)
+      // cancel
+      if (res.result === 1) {
+        return false
+      } else {
+        db.set('settings.privacyEnsure', true)
+        return true
+      }
+    }
+    return true
+  }
+
+  async show (showCancel = true) {
+    const res = await showMessageBox({
+      type: 'info',
+      buttons: showCancel ? ['Yes', 'No'] : ['Yes'],
+      title: '隐私协议',
+      message: `
+      本软件尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更优质的服务，本软件会按照本隐私权政策的规定使用和收集您的一些行为信息。您在同意本软件服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本软件服务使用协议不可分割的一部分，如果不同意将无法使用。本协议会定期更新。
+
+      1.适用范围
+
+      a)在您使用本软件时，本软件会记录的您对本软件的一些操作行为信息，包括但不限于您使用本软件进行文件上传的耗时、类型、数量等信息。
+
+      2.信息的使用
+
+      a)在获得您的使用数据之后，本软件会将其上传至数据分析服务器，以便分析数据后，提供给您更好的服务。
+
+      3.信息披露
+
+      a)本软件不会将您的信息披露给不受信任的第三方。
+
+      b)根据法律的有关规定，或者行政或司法机构的要求，向第三方或者行政、司法机构披露；
+
+      c)如您出现违反中国有关法律、法规或者相关规则的情况，需要向第三方披露；
+
+      4.信息安全
+
+      a)本软件不会收集您的个人信息、密钥信息等隐私信息，所收集的信息仅仅作为改善软件、优化体验、了解软件日活等用途。
+      `
+    })
+    return res
+  }
+}
+
+const privacyManager = new PrivacyManager()
+
+export {
+  privacyManager
+}
@@ -186,6 +186,9 @@ import {
 import db from '#/datastore'
 import mixin from '@/utils/mixin'
 import InputBoxDialog from '@/components/InputBoxDialog.vue'
+import {
+  SHOW_PRIVACY_MESSAGE
+} from '~/universal/events/constants'
 const { Menu, dialog, BrowserWindow } = remote
 const customLinkRule = (rule: string, value: string, callback: (arg0?: Error) => void) => {
  if (!/\$url/.test(value)) {
@@ -301,6 +304,12 @@ export default class extends Vue {
        click () {
          _this.qrcodeVisible = true
        }
+      },
+      {
+        label: '隐私协议',
+        click () {
+          ipcRenderer.send(SHOW_PRIVACY_MESSAGE)
+        }
      }
    ]
    this.menu = Menu.buildFromTemplate(template)
@@ -23,7 +23,7 @@ import {
  IpcRendererEvent,
  remote
 } from 'electron'
-import path from 'path'
+import { SHOW_PRIVACY_MESSAGE } from '~/universal/events/constants'
@Component({
  name: 'mini-page',
  mixins: [mixin]
@@ -176,6 +176,12 @@ export default class extends Vue {
          remote.BrowserWindow.getFocusedWindow()!.hide()
        }
      },
+      {
+        label: '隐私协议',
+        click () {
+          ipcRenderer.send(SHOW_PRIVACY_MESSAGE)
+        }
+      },
      {
        label: '重启应用',
        click () {
@@ -174,12 +174,15 @@ export default class extends Vue {
      this.pluginNameList = list.map(item => item.fullName)
      this.loading = false
    })
-    ipcRenderer.on('installSuccess', (evt: IpcRendererEvent, plugin: string) => {
+    ipcRenderer.on('installPlugin', (evt: IpcRendererEvent, { success, body }: {
+      success: boolean,
+      body: string
+    }) => {
      this.loading = false
      this.pluginList.forEach(item => {
-        if (item.fullName === plugin) {
+        if (item.fullName === body) {
          item.ing = false
-          item.hasInstall = true
+          item.hasInstall = success
        }
      })
    })
@@ -242,6 +245,7 @@ export default class extends Vue {
        if (plugin.config.uploader.name) {
          _this.handleRestoreState('uploader', plugin.config.uploader.name)
        }
+        _this.needReload = true
      }
    }, {
      label: '卸载插件',
@@ -315,13 +319,13 @@ export default class extends Vue {
        type: 'warning'
      }).then(() => {
        item.ing = true
-        ipcRenderer.send('installPlugin', item.name)
+        ipcRenderer.send('installPlugin', item.fullName)
      }).catch(() => {
        console.log('Install canceled')
      })
    } else {
      item.ing = true
-      ipcRenderer.send('installPlugin', item.name)
+      ipcRenderer.send('installPlugin', item.fullName)
    }
  }
  uninstallPlugin (val: string) {
@@ -479,7 +483,7 @@ export default class extends Vue {
  }
  beforeDestroy () {
    ipcRenderer.removeAllListeners('pluginList')
-    ipcRenderer.removeAllListeners('installSuccess')
+    ipcRenderer.removeAllListeners('installPlugin')
    ipcRenderer.removeAllListeners('uninstallSuccess')
    ipcRenderer.removeAllListeners('updateSuccess')
    ipcRenderer.removeAllListeners('hideLoading')
@@ -2,7 +2,7 @@ import { Component, Vue } from 'vue-property-decorator'
 import { ipcRenderer } from 'electron'
@Component
 export default class extends Vue {
-  defaultPicBed = this.$db.get('picBed.current')
+  defaultPicBed = this.$db.get('picBed.uploader') || this.$db.get('picBed.current') || 'smms'
  setDefaultPicBed (type: string) {
    this.letPicGoSaveData({
      'picBed.current': type,
@@ -0,0 +1,23 @@
+/* eslint-disable camelcase */
+import {
+  TALKING_DATA_APPID, TALKING_DATA_EVENT
+} from '~/universal/events/constants'
+import pkg from 'root/package.json'
+import { ipcRenderer } from 'electron'
+import { handleTalkingDataEvent } from './common'
+const { version } = pkg
+
+export const initTalkingData = () => {
+  setTimeout(() => {
+    const talkingDataScript = document.createElement('script')
+
+    talkingDataScript.src = `http://sdk.talkingdata.com/app/h5/v1?appid=${TALKING_DATA_APPID}&vn=${version}&vc=${version}`
+
+    const head = document.getElementsByTagName('head')[0]
+    head.appendChild(talkingDataScript)
+  }, 0)
+}
+
+ipcRenderer.on(TALKING_DATA_EVENT, (_, data: ITalkingDataOptions) => {
+  handleTalkingDataEvent(data)
+})
@@ -0,0 +1,10 @@
+const isDevelopment = process.env.NODE_ENV !== 'production'
+/* eslint-disable camelcase */
+export const handleTalkingDataEvent = (data: ITalkingDataOptions) => {
+  const { EventId, Label = '', MapKv = {} } = data
+  MapKv.from = window.location.href
+  window.TDAPP.onEvent(EventId, Label, MapKv)
+  if (isDevelopment) {
+    console.log('talkingData', data)
+  }
+}
@@ -1,3 +1,6 @@
 export const SHOW_INPUT_BOX = 'SHOW_INPUT_BOX'
 export const SHOW_INPUT_BOX_RESPONSE = 'SHOW_INPUT_BOX_RESPONSE'
 export const TOGGLE_SHORTKEY_MODIFIED_MODE = 'TOGGLE_SHORTKEY_MODIFIED_MODE'
+export const TALKING_DATA_APPID = '7E6832BCE3F1438696579E541DFEBFDA'
+export const TALKING_DATA_EVENT = 'TALKING_DATA_EVENT'
+export const SHOW_PRIVACY_MESSAGE = 'SHOW_PRIVACY_MESSAGE'
@@ -10,4 +10,10 @@ declare global {
      [elem: string]: any
    }
  }
+
+  interface Window {
+    TDAPP: {
+      onEvent: (EventId: string, Label?: string, MapKv?: IStringKeyMap) => void
+    }
+  }
 }
@@ -295,3 +295,20 @@ interface IAppNotification {
  body: string
  icon?: string
 }
+
+interface ITalkingDataOptions {
+  EventId: string
+  Label?: string
+  MapKv?: IStringKeyMap
+}
+
+interface IAnalyticsData {
+  fromClipboard: boolean
+  type: string
+  count: number
+  duration?: number // 耗时
+}
+
+interface IStringKeyMap {
+  [propName: string]: any
+}
@@ -13,6 +13,11 @@ const config = {
      .set('~', resolve('src'))
      .set('root', resolve('./'))
      .set('#', resolve('src/universal'))
+    // define
+    // config.plugin('define')
+    //   .tap(args => {
+    //     return args
+    //   })
  },
  pluginOptions: {
    electronBuilder: {
@@ -83,6 +88,8 @@ if (process.env.NODE_ENV === 'development') {
  config.configureWebpack = {
    devtool: 'eval-source-map'
  }
+  // for dev main process hot reload
+  config.pluginOptions.electronBuilder.mainProcessWatch = ['src/main/**/*']
 }

 module.exports = {
@@ -4189,6 +4189,16 @@ electron-chromedriver@^5.0.1:
    electron-download "^4.1.1"
    extract-zip "^1.6.7"

+electron-devtools-installer@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-3.2.0.tgz#acc48d24eb7033fe5af284a19667e73b78d406d0"
+  integrity sha512-t3UczsYugm4OAbqvdImMCImIMVdFzJAHgbwHpkl5jmfu1izVgUcP/mnrPqJIpEeCK1uZGpt+yHgWEN+9EwoYhQ==
+  dependencies:
+    rimraf "^3.0.2"
+    semver "^7.2.1"
+    tslib "^2.1.0"
+    unzip-crx-3 "^0.2.0"
+
 electron-download@^4.1.0, electron-download@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.1.tgz#02e69556705cc456e520f9e035556ed5a015ebe8"
@@ -7109,6 +7119,13 @@ lru-cache@^5.1.1:
  dependencies:
    yallist "^3.0.2"

+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 make-dir@^1.0.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -9454,6 +9471,13 @@ rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1:
  dependencies:
    glob "^7.1.3"

+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -9607,6 +9631,13 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0:
  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

+semver@^7.2.1:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 send@0.17.1:
  version "0.17.1"
  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -10713,6 +10744,11 @@ tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==

+tslib@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
+  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
+
 tslint@^5.20.1:
  version "5.20.1"
  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d"
@@ -10909,6 +10945,15 @@ unset-value@^1.0.0:
    has-value "^0.3.1"
    isobject "^3.0.0"

+unzip-crx-3@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/unzip-crx-3/-/unzip-crx-3-0.2.0.tgz#d5324147b104a8aed9ae8639c95521f6f7cda292"
+  integrity sha512-0+JiUq/z7faJ6oifVB5nSwt589v1KCduqIJupNVDoWSXZtWDmjDGO3RAEOvwJ07w90aoXoP4enKsR7ecMrJtWQ==
+  dependencies:
+    jszip "^3.1.0"
+    mkdirp "^0.5.1"
+    yaku "^0.16.6"
+
 unzip-crx@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/unzip-crx/-/unzip-crx-0.2.0.tgz#4c0baa8bdac756256754beca7843c13d7b858c18"
Author	SHA1	Message	Date
PiEgg	a312d06b62	🎉 Release: v2.3.0-beta.6	2021-04-24 18:12:46 +08:00
PiEgg	a1b70b4cb1	🐛 Fix: disable plugin need reload app	2021-04-24 18:11:50 +08:00
PiEgg	2d9e9c0a00	✨ Feature: add logs for picgo-server ISSUES CLOSED: #627	2021-04-24 17:56:56 +08:00
PiEgg	a657c51bb5	🐛 Fix: dev error with install vue-devtools ISSUES CLOSED: #653, #658	2021-04-24 12:14:15 +08:00
PiEgg	321e33967c	🐛 Fix: windows cli uploading bug ISSUES CLOSED: #657	2021-04-24 00:44:49 +08:00
PiEgg	0a986c8933	🐛 Fix: default picBed using picBed.uploader instead of picBed.current	2021-04-21 23:20:21 +08:00
PiEgg	69e1dc8128	📦 Chore: fix eslint error notice in indent	2021-04-16 10:12:11 +08:00
PiEgg	b05139fc9a	🐛 Fix: add plugin install failed notice	2021-04-11 11:11:22 +08:00
PiEgg	992ff35936	✨ Feature: add privacy policy	2021-04-10 21:01:55 +08:00
PiEgg	06d40ef7f6	🐛 Fix: fix analytics value	2021-04-05 22:43:23 +08:00
PiEgg	f53639153e	✨ Feature: add baidu tongji for analytics	2021-04-05 17:47:06 +08:00
PiEgg	3fd6e4e4c8	📦 Chore: add main process hot reload	2021-04-05 16:09:27 +08:00