package/go_process_manager
1
0
Fork 0
mirror of https://github.com/lzh-1625/go_process_manager.git synced 2025-10-05 07:56:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
akrike
2025-06-08 22:17:24 +08:00
parent b39302822f
commit bc9e33ab4d
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/app/api/ws.go
View File

@@ -9,7 +9,6 @@ import (
"github.com/lzh-1625/go_process_manager/config" "github.com/lzh-1625/go_process_manager/config"
"github.com/lzh-1625/go_process_manager/internal/app/constants" "github.com/lzh-1625/go_process_manager/internal/app/constants"
"github.com/lzh-1625/go_process_manager/internal/app/logic" "github.com/lzh-1625/go_process_manager/internal/app/logic"
"github.com/lzh-1625/go_process_manager/internal/app/middle"
"github.com/lzh-1625/go_process_manager/internal/app/repository" "github.com/lzh-1625/go_process_manager/internal/app/repository"
"github.com/lzh-1625/go_process_manager/log" "github.com/lzh-1625/go_process_manager/log"
"github.com/lzh-1625/go_process_manager/utils" "github.com/lzh-1625/go_process_manager/utils"
@@ -75,14 +74,11 @@ func (w *wsApi) WebsocketHandle(ctx *gin.Context) {
proc.ReadCache(wci) proc.ReadCache(wci)
w.startWsConnect(wci, cancel, proc, hasOprPermission(ctx, uuid, constants.OPERATION_TERMINAL_WRITE)) w.startWsConnect(wci, cancel, proc, hasOprPermission(ctx, uuid, constants.OPERATION_TERMINAL_WRITE))
proc.AddConn(reqUser, wci) proc.AddConn(reqUser, wci)
defer middle.ProcessWaitCond.Trigger()
defer proc.DeleteConn(reqUser) defer proc.DeleteConn(reqUser)
conn.SetCloseHandler(func(_ int, _ string) error { conn.SetCloseHandler(func(_ int, _ string) error {
middle.ProcessWaitCond.Trigger()
cancel() cancel()
return nil return nil
}) })
middle.ProcessWaitCond.Trigger()
select { select {
case <-proc.StopChan: case <-proc.StopChan:
log.Logger.Infow("ws连接断开", "操作类型", "进程已停止，强制断开ws连接") log.Logger.Infow("ws连接断开", "操作类型", "进程已停止，强制断开ws连接")
@@ -101,8 +97,8 @@ func (w *wsApi) WebsocketShareHandle(ctx *gin.Context) {
errCheck(ctx, data.ExpireTime.Unix() <= time.Now().Unix(), "Share expired!") errCheck(ctx, data.ExpireTime.Unix() <= time.Now().Unix(), "Share expired!")
proc, err := logic.ProcessCtlLogic.GetProcess(data.Pid) proc, err := logic.ProcessCtlLogic.GetProcess(data.Pid)
errCheck(ctx, err != nil, err) errCheck(ctx, err != nil, err)
gusetName := "guest-" + strconv.Itoa(data.Id) // 构造访客用户名 guestName := "guest-" + strconv.Itoa(data.Id) // 构造访客用户名
errCheck(ctx, proc.HasWsConn(gusetName), "A connection already exists; unable to establish a new one!") errCheck(ctx, proc.HasWsConn(guestName), "A connection already exists; unable to establish a new one!")
errCheck(ctx, proc.State.State != 1, "The process is currently running.") errCheck(ctx, proc.State.State != 1, "The process is currently running.")
errCheck(ctx, !proc.VerifyControl(), "Insufficient permissions; please check your access rights!") errCheck(ctx, !proc.VerifyControl(), "Insufficient permissions; please check your access rights!")
conn, err := upgrader.Upgrade(ctx.Writer, ctx.Request, nil) conn, err := upgrader.Upgrade(ctx.Writer, ctx.Request, nil)
@@ -119,15 +115,12 @@ func (w *wsApi) WebsocketShareHandle(ctx *gin.Context) {
} }
proc.ReadCache(wci) proc.ReadCache(wci)
w.startWsConnect(wci, cancel, proc, data.Write) w.startWsConnect(wci, cancel, proc, data.Write)
proc.AddConn(gusetName, wci) proc.AddConn(guestName, wci)
defer middle.ProcessWaitCond.Trigger() defer proc.DeleteConn(guestName)
defer proc.DeleteConn(gusetName)
conn.SetCloseHandler(func(_ int, _ string) error { conn.SetCloseHandler(func(_ int, _ string) error {
middle.ProcessWaitCond.Trigger()
cancel() cancel()
return nil return nil
}) })
middle.ProcessWaitCond.Trigger()
select { select {
case <-proc.StopChan: case <-proc.StopChan:
log.Logger.Infow("ws连接断开", "操作类型", "进程已停止，强制断开ws连接") log.Logger.Infow("ws连接断开", "操作类型", "进程已停止，强制断开ws连接")

2
internal/app/logic/process_base.go
View File

@@ -177,12 +177,14 @@ func (p *ProcessBase) AddConn(user string, c ConnectInstance) {
p.wsLock.Lock() p.wsLock.Lock()
defer p.wsLock.Unlock() defer p.wsLock.Unlock()
p.ws[user] = c p.ws[user] = c
middle.ProcessWaitCond.Trigger()
} }
func (p *ProcessBase) DeleteConn(user string) { func (p *ProcessBase) DeleteConn(user string) {
p.wsLock.Lock() p.wsLock.Lock()
defer p.wsLock.Unlock() defer p.wsLock.Unlock()
delete(p.ws, user) delete(p.ws, user)
middle.ProcessWaitCond.Trigger()
} }
func (p *ProcessBase) logReportHandler(log string) { func (p *ProcessBase) logReportHandler(log string) {

2
internal/app/middle/wait.go
View File

@@ -29,7 +29,7 @@ func InitWaitCond() {
func newWaitCond() *waitCond { func newWaitCond() *waitCond {
wc := &waitCond{ wc := &waitCond{
cond: *sync.NewCond(&sync.Mutex{}), cond: *sync.NewCond(&sync.Mutex{}),
ts: time.Now().UnixMicro(), ts: time.Now().UnixNano(),
timeMap: sync.Map{}, timeMap: sync.Map{},
trigger: make(chan struct{}), trigger: make(chan struct{}),
} }