diff --git a/packages/core/src/shell/scripts/set-system-proxy/index.js b/packages/core/src/shell/scripts/set-system-proxy/index.js
index a5f33d2..ab63e9d 100644
--- a/packages/core/src/shell/scripts/set-system-proxy/index.js
+++ b/packages/core/src/shell/scripts/set-system-proxy/index.js
@@ -128,7 +128,8 @@ const executor = {
async mac (exec, params) {
// exec = _exec
let wifiAdaptor = await exec('sh -c "networksetup -listnetworkserviceorder | grep `route -n get 0.0.0.0 | grep \'interface\' | cut -d \':\' -f2` -B 1 | head -n 1 "')
- wifiAdaptor = wifiAdaptor.substring(3).trim()
+ wifiAdaptor = wifiAdaptor.trim()
+ wifiAdaptor = wifiAdaptor.substring(wifiAdaptor.indexOf(' ')).trim()
if (params == null) {
await exec(`networksetup -setwebproxystate '${wifiAdaptor}' off`)
diff --git a/packages/core/test/macProxy.js b/packages/core/test/macProxy.js
index 2ce5a6d..d873cc1 100644
--- a/packages/core/test/macProxy.js
+++ b/packages/core/test/macProxy.js
@@ -11,3 +11,6 @@
// test().then((ret) => {
// console.log('haha', ret)
// })
+let wifiAdaptor = '(151) test'
+wifiAdaptor = wifiAdaptor.substring(wifiAdaptor.indexOf(' ')).trim()
+console.log(wifiAdaptor)
diff --git a/packages/gui/package.json b/packages/gui/package.json
index 92a6617..0c1d3d4 100644
--- a/packages/gui/package.json
+++ b/packages/gui/package.json
@@ -18,15 +18,20 @@
"dependencies": {
"@docmirror/dev-sidecar": "^1.5.0",
"@docmirror/mitmproxy": "^1.5.0",
+ "adm-zip": "^0.5.5",
"ant-design-vue": "^1.6.5",
+ "compressing": "^1.5.1",
"core-js": "^3.6.5",
"electron-baidu-tongji": "^1.0.5",
+ "electron-reload": "^1.5.0",
"electron-store": "^6.0.1",
"electron-updater": "^4.3.5",
"es-abstract": "^1.17.7",
+ "extract-zip": "^2.0.1",
"json5": "^2.1.3",
"lodash": "^4.17.20",
"log4js": "^6.3.0",
+ "request-progress": "^3.0.0",
"sass": "^1.27.1",
"sass-loader": "^10.0.4",
"vue": "^2.6.11",
diff --git a/packages/gui/pkg/after-pack.js b/packages/gui/pkg/after-pack.js
new file mode 100644
index 0000000..9fd1535
--- /dev/null
+++ b/packages/gui/pkg/after-pack.js
@@ -0,0 +1,28 @@
+const path = require('path')
+const AdmZip = require('adm-zip')
+const pkg = require('../package.json')
+const fs = require('fs')
+exports.default = async function (context) {
+ console.log('context', context)
+ let targetPath
+ let latest = null
+ if (context.packager.platform.nodeName === 'darwin') {
+ targetPath = path.join(context.appOutDir, `${context.packager.appInfo.productName}.app/Contents/Resources`)
+ latest = 'latest-mac.yml'
+ } else {
+ targetPath = path.join(context.appOutDir, './resources')
+ latest = 'latest.yml'
+ }
+ const zip = new AdmZip()
+ zip.addLocalFolder(targetPath)
+ const partUpdateFile = `update-${pkg.version}.zip`
+ zip.writeZip(path.join(context.outDir, partUpdateFile))
+
+ const partUpdateUrl = 'http://dev-sidecar.docmirror.cn/update/' + partUpdateFile
+
+ fs.appendFile(path.join(context.outDir, latest), `partPackage: ${partUpdateUrl}\nreleaseNotes: \n - 升级日志`, (err) => {
+ if (err) {
+ console.log('修改latest 失败')
+ }
+ })
+}
diff --git a/packages/gui/src/bridge/update/backend.js b/packages/gui/src/bridge/update/backend.js
index bd89c04..429eda3 100644
--- a/packages/gui/src/bridge/update/backend.js
+++ b/packages/gui/src/bridge/update/backend.js
@@ -1,13 +1,39 @@
import { ipcMain } from 'electron'
import { autoUpdater } from 'electron-updater'
import path from 'path'
+import request from 'request'
+import progress from 'request-progress'
// win是所有窗口的引用
-// const path = require('path') // 引入path模块
-// const fs = require('fs-extra')
+import fs from 'fs'
+import AdmZip from 'adm-zip'
+import logger from '../../utils/util.log'
// eslint-disable-next-line no-unused-vars
const isMac = process.platform === 'darwin'
+
+function downloadFile (uri, filePath, onProgress, onSuccess, onError) {
+ progress(request(uri), {
+ // throttle: 2000, // Throttle the progress event to 2000ms, defaults to 1000ms
+ // delay: 1000, // Only start to emit after 1000ms delay, defaults to 0ms
+ // lengthHeader: 'x-transfer-length' // Length header to use, defaults to content-length
+ })
+ .on('progress', function (state) {
+ onProgress(state.percent * 100)
+ logger.log('progress', state.percent)
+ })
+ .on('error', function (err) {
+ // Do something with err
+ logger.error('下载升级包失败', err)
+ onError(err)
+ })
+ .on('end', function () {
+ // Do something after request finishes
+ onSuccess()
+ })
+ .pipe(fs.createWriteStream(filePath))
+}
+
// 检测更新，在你想要检查更新的时候执行，renderer事件触发后的操作自行编写
-function updateHandle (app, win, beforeQuit, updateUrl, log) {
+function updateHandle (app, win, beforeQuit, log) {
// // 更新前，删除本地安装包 ↓
// const updaterCacheDirName = 'dev-sidecar-updater'
// const updatePendingPath = path.join(autoUpdater.app.baseCachePath, updaterCacheDirName, 'pending')
@@ -22,14 +48,54 @@ function updateHandle (app, win, beforeQuit, updateUrl, log) {
// 本地开发环境，改变app-update.yml地址
if (process.env.NODE_ENV === 'development' && !isMac) {
autoUpdater.updateConfigPath = path.join(__dirname, 'win-unpacked/resources/app-update.yml')
+ autoUpdater.setFeedURL({
+ provider: 'generic',
+ url: 'http://localhost/dev-sidecar/'
+ })
}
autoUpdater.autoDownload = false
- // 设置服务器更新地址
- autoUpdater.setFeedURL({
- provider: 'generic',
- url: updateUrl
- })
+ let partPackagePath = null
+
+ function downloadPart (app, value) {
+ const appPath = app.getAppPath()
+ const fileDir = path.join(appPath, 'update')
+ console.log('fileDir', fileDir)
+ try {
+ fs.accessSync(fileDir, fs.constants.F_OK)
+ } catch (e) {
+ fs.mkdirSync(fileDir)
+ }
+ const filePath = path.join(fileDir, value.version + '.zip')
+
+ downloadFile(value.partPackage, filePath, (data) => {
+ win.webContents.send('update', { key: 'progress', value: parseInt(data) })
+ }, () => {
+ // 文件下载完成
+ win.webContents.send('update', { key: 'progress', value: 100 })
+ logger.info('升级包下载成功：', filePath)
+ partPackagePath = filePath
+ win.webContents.send('update', {
+ key: 'downloaded',
+ value: value
+ })
+ }, (error) => {
+ sendUpdateMessage({ key: 'error', value: error, error: error })
+ })
+ }
+
+ function updatePart (app, value, partPackagePath) {
+ const appPath = app.getAppPath()
+ const target = path.join(appPath, 'resources')
+ log.info('开始解压缩，安装升级包', partPackagePath, target)
+ // 解压缩
+ var zip = new AdmZip(partPackagePath)
+ zip.extractAllTo(target, true)
+ log.info('安装完成，重启app')
+ app.relaunch()
+ app.quit()
+ }
+
autoUpdater.on('error', function (error) {
log.info('autoUpdater error', error)
sendUpdateMessage({ key: 'error', value: error, error: error })
@@ -63,6 +129,10 @@ function updateHandle (app, win, beforeQuit, updateUrl, log) {
ipcMain.on('update', (e, arg) => {
if (arg.key === 'doUpdateNow') {
+ if (partPackagePath) {
+ updatePart(app, arg.value, partPackagePath)
+ return
+ }
// some code here to handle event
beforeQuit().then(() => {
autoUpdater.quitAndInstall()
@@ -80,6 +150,11 @@ function updateHandle (app, win, beforeQuit, updateUrl, log) {
// 下载新版本
log.info('autoUpdater downloadUpdate')
autoUpdater.downloadUpdate()
+ } else if (arg.key === 'downloadPart') {
+ // 下载增量更新版本
+ log.info('autoUpdater downloadPart')
+ // autoUpdater.downloadUpdate()
+ downloadPart(app, arg.value)
}
})
// 通过main进程发送事件给renderer进程，提示更新信息
@@ -95,7 +170,6 @@ function updateHandle (app, win, beforeQuit, updateUrl, log) {
export default {
install (context) {
const { app, win, beforeQuit, log } = context
- const updateUrl = 'http://dev-sidecar.docmirror.cn/update/'
if (process.env.NODE_ENV === 'development') {
Object.defineProperty(app, 'isPackaged', {
get () {
@@ -105,6 +179,6 @@ export default {
// updateUrl = 'http://dev-sidecar.docmirror.cn/update/'
// updateUrl = 'http://localhost/dev-sidecar/'
}
- updateHandle(app, win, beforeQuit, updateUrl, log)
+ updateHandle(app, win, beforeQuit, log)
}
}
diff --git a/packages/gui/src/bridge/update/front.js b/packages/gui/src/bridge/update/front.js
index ce69583..c620f1c 100644
--- a/packages/gui/src/bridge/update/front.js
+++ b/packages/gui/src/bridge/update/front.js
@@ -1,6 +1,6 @@
function install (app, api) {
- const updateParams = app.$global.update = { fromUser: false, autoDownload: true, progress: 0, downloading: false, newVersion: false }
+ const updateParams = app.$global.update = { fromUser: false, autoDownload: true, progress: 0, downloading: false, newVersion: false, isFullUpdate: true }
api.ipc.on('update', (event, message) => {
console.log('on message', event, message)
handleUpdateMessage(message, app)
@@ -16,6 +16,10 @@ function install (app, api) {
downloadUpdate () {
api.ipc.send('update', { key: 'downloadUpdate' })
},
+ downloadPart (value) {
+ // 增量更新
+ api.ipc.send('update', { key: 'downloadPart', value })
+ },
doUpdateNow () {
api.ipc.send('update', { key: 'doUpdateNow' })
}
@@ -50,6 +54,15 @@ function install (app, api) {
function progressUpdate (value) {
updateParams.progress = value
}
+
+ function downloadNewVersion (value) {
+ if (value.partPackage) {
+ // 有增量更新
+ api.update.downloadPart(value)
+ } else {
+ api.update.downloadUpdate()
+ }
+ }
function foundNewVersion (value) {
updateParams.newVersion = true
@@ -71,18 +84,26 @@ function install (app, api) {
}
})
- api.update.downloadUpdate()
+ downloadNewVersion(value)
return
}
app.$confirm({
title: '发现新版本',
- content: `是否要更新到v${value.version}?`,
cancelText: '暂不升级',
okText: '升级',
- // content: h => {value.version}更新内容：
{value.releaseNotes}