Browse Source

fix: deb package

pull/88/head
xiaojunnuo 3 years ago
parent
commit
30e551444d
  1. 13
      doc/linux.md
  2. 7
      packages/core/src/modules/server/index.js
  3. 9
      packages/gui/package.json
  4. 2
      packages/gui/src/bridge/auto-start/backend.js
  5. 3
      packages/gui/src/bridge/update/backend.js
  6. 4
      packages/gui/vue.config.js
  7. 11
      packages/mitmproxy/src/index.js
  8. 1
      test/test.js

13
doc/linux.md

@ -0,0 +1,13 @@
# linux
## anzhuang
## zhengshu
### huohu
### chrome
## xiezai

7
packages/core/src/modules/server/index.js

@ -82,8 +82,11 @@ const serverApi = {
serverProcess.on('beforeExit', (code) => {
log.warn('server process beforeExit', code)
})
serverProcess.on('exit', (code) => {
log.warn('server process exit', code)
serverProcess.on('SIGPIPE', (code, signal) => {
log.warn('server process SIGPIPE', code, signal)
})
serverProcess.on('exit', (code, signal) => {
log.warn('server process exit', code, signal)
})
serverProcess.on('uncaughtException', (err, origin) => {
log.error('server process uncaughtException', err)

9
packages/gui/package.json

@ -3,6 +3,7 @@
"version": "1.5.1",
"private": false,
"license": "MPL-2.0",
"main": "background.js",
"scripts": {
"serve": "vue-cli-service serve",
"lint": "vue-cli-service lint",
@ -13,8 +14,11 @@
"electron:icons": "electron-icon-builder --input=./public/logo/win.png --output=build --flatten",
"electron:icons-mac": "electron-icon-builder --input=./public/logo/mac.png --output=build --flatten"
},
"author": "Greper",
"main": "background.js",
"homepage": "https://github.com/docmirror/dev-sidecar",
"author": {
"email": "xiaojunnuo@qq.com",
"name": "Greper"
},
"dependencies": {
"@docmirror/dev-sidecar": "^1.5.1",
"@docmirror/mitmproxy": "^1.5.1",
@ -47,7 +51,6 @@
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.0",
"json5-loader": "^4.0.1",
"@vue/cli-plugin-babel": "~4.5.0",
"@vue/cli-plugin-eslint": "~4.5.0",
"@vue/cli-service": "~4.5.0",

2
packages/gui/src/bridge/auto-start/backend.js

@ -8,7 +8,7 @@ export default {
// 开启 开机自启动
ipcMain.on('auto-start', (event, message) => {
console.log('updateExe', ex)
log.info('auto-start', app.getPath('exe'))
if (message.value) {
app.setLoginItemSettings({
openAtLogin: true,

3
packages/gui/src/bridge/update/backend.js

@ -10,6 +10,7 @@ import logger from '../../utils/util.log'
import appPathUtil from '../../utils/util.apppath'
// eslint-disable-next-line no-unused-vars
const isMac = process.platform === 'darwin'
const isLinux = process.platform === 'linux'
function downloadFile (uri, filePath, onProgress, onSuccess, onError) {
progress(request(uri), {
@ -54,6 +55,8 @@ function updateHandle (app, api, win, beforeQuit, quit, log) {
})
if (isMac) {
autoUpdater.updateConfigPath = path.join(__dirname, 'mac/DevSidecar.app/Contents/Resources/app-update.yml')
} else if (isLinux) {
autoUpdater.updateConfigPath = path.join(__dirname, 'mac/DevSidecar.app/Contents/Resources/app-update.yml')
} else {
autoUpdater.updateConfigPath = path.join(__dirname, 'win-unpacked/resources/app-update.yml')
}

4
packages/gui/vue.config.js

@ -47,7 +47,7 @@ module.exports = {
}
],
appId: 'dev-sidecar',
productName: 'DevSidecar',
productName: 'dev-sidecar',
// eslint-disable-next-line no-template-curly-in-string
artifactName: 'DevSidecar-${version}.${ext}',
copyright: 'Copyright © 2020-2021 Greper',
@ -67,7 +67,7 @@ module.exports = {
linux: {
icon: './build/mac/',
target: [
'AppImage'
'deb'
]
},
publish: {

11
packages/mitmproxy/src/index.js

@ -37,11 +37,14 @@ function registerProcessListener () {
process.on('uncaughtExceptionMonitor', (err, origin) => {
log.info('uncaughtExceptionMonitor:', err, origin)
})
process.on('exit', function (code) {
log.info('代理服务进程被关闭:', code)
process.on('exit', function (code, signal) {
log.info('代理服务进程被关闭:', code, signal)
})
process.on('beforeExit', (code) => {
console.log('Process beforeExit event with code: ', code)
process.on('beforeExit', (code, signal) => {
console.log('Process beforeExit event with code: ', code, signal)
})
process.on('SIGPIPE', (code, signal) => {
log.warn('sub Process SIGPIPE', code, signal)
})
}

1
test/test.js

@ -31,7 +31,6 @@ function testCa() {
process.env.NODE_EXTRA_CA_CERTS = 'C:\\Users\\Administrator\\.dev-sidecar\\dev-sidecar.ca.crt'
process.env.GLOBAL_AGENT_HTTP_PROXY = "http://127.0.0.1:1181"
process.env.GLOBAL_AGENT_HTTPS_PROXY = "http://127.0.0.1:1181"
console.log('111', process.env.NODE_EXTRA_CA_CERTS)
const options = {
agent : new https.Agent({

Loading…
Cancel
Save