Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 16:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 改进桌面端拉起内核 https://github.com/siyuan-note/siyuan/issues/6894

Browse source
This commit is contained in:
Liang Ding 2022-12-20 19:56:29 +08:00
parent 9de0fe0d93
commit 2964cba5f5
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

80
app/electron/main.js
View file

@ -548,46 +548,6 @@ const boot = () => {
} }
} }
let kernelPort = 6806
let tryGetPortCount = 0
const net = require("net");
const getAvailablePort = (port = kernelPort) => {
// https://gist.github.com/mikeal/1840641
const server = net.createServer()
return new Promise((resolve, reject) => server
.on('error', error => {
writeLog(error)
if (2048 < ++tryGetPortCount) {
writeLog('failed to get available port [tryCount=' + tryGetPortCount + ', port=' + port + ']')
reject(error)
return
}
server.listen(++port)
})
.on('listening', () => {
writeLog('found an available port [' + port + ']')
server.close(() => resolve(port))
})
.listen(port, '127.0.0.1'))
}
const getKernelPort = async () => {
if (isDevEnv) {
writeLog("got kernel port [" + kernelPort + "]")
return kernelPort
}
// 改进桌面端拉起内核 https://github.com/siyuan-note/siyuan/issues/6894
kernelPort = await getAvailablePort()
writeLog("got kernel available port [" + kernelPort + "]")
return kernelPort
}
const getServer = () => {
return "http://" + localhost + ":" + kernelPort
}
const initKernel = (initData) => { const initKernel = (initData) => {
return new Promise(async (resolve) => { return new Promise(async (resolve) => {
bootWindow = new BrowserWindow({ bootWindow = new BrowserWindow({
@ -910,3 +870,43 @@ const isOnline = async () => {
} }
} }
} }
let kernelPort = 6806
let tryGetPortCount = 0
const net = require("net");
const getAvailablePort = (port = kernelPort) => {
// https://gist.github.com/mikeal/1840641
const server = net.createServer()
return new Promise((resolve, reject) => server
.on('error', error => {
writeLog(error)
if (2048 < ++tryGetPortCount) {
writeLog('failed to get available port [tryCount=' + tryGetPortCount + ', port=' + port + ']')
reject(error)
return
}
server.listen(++port)
})
.on('listening', () => {
writeLog('found an available port [' + port + ']')
server.close(() => resolve(port))
})
.listen(port, '127.0.0.1'))
}
const getKernelPort = async () => {
if (isDevEnv) {
writeLog("got kernel port [" + kernelPort + "]")
return kernelPort
}
// 改进桌面端拉起内核 https://github.com/siyuan-note/siyuan/issues/6894
kernelPort = await getAvailablePort()
writeLog("got kernel available port [" + kernelPort + "]")
return kernelPort
}
const getServer = () => {
return "http://" + localhost + ":" + kernelPort
}