xinyin025/geekai
1
0
Fork 0
mirror of https://github.com/yangjian102621/geekai.git synced 2025-09-17 16:56:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

opt: add heartbeat message for websocket connects

Browse Source
This commit is contained in:
RockYang 2024-01-22 18:42:51 +08:00
parent b3d0c1ef9c
commit 0f05970141
4 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -9,6 +9,8 @@
* 功能新增：新增阿里通义千问大模型支持
* Bug修复：修复 MJ 放大任务失败时候 img_call 会增加的 Bug
* 功能优化：新增虎皮椒和PayJS订单状态校验功能，增加安全性
* Bug修复：修复微信转账交易 ID 提取失败 Bug
* 功能优化：给所有的 websocket 连接加上心跳，解决 "close 1006 (abnormal closure): unexpected EOF" Bug
## v3.2.5

22
api/handler/chatimpl/chat_handler.go
View File

@ -134,7 +134,6 @@ func (h *ChatHandler) ChatHandle(c *gin.Context) {
for {
_, msg, err := client.Receive()
if err != nil {
logger.Error(err)
client.Close()
h.App.ChatClients.Delete(sessionId)
cancelFunc := h.App.ReqCancelFunc.Get(sessionId)
@ -145,19 +144,30 @@ func (h *ChatHandler) ChatHandle(c *gin.Context) {
return
}
message := string(msg)
logger.Info("Receive a message: ", message)
//utils.ReplyMessage(client, "这是一条测试消息！")
var message types.WsMessage
err = utils.JsonDecode(string(msg), &message)
if err != nil {
continue
}
// 心跳消息
if message.Type == "heartbeat" {
logger.Debug("收到 Chat 心跳消息：", message.Content)
continue
}
logger.Info("Receive a message: ", message.Content)
ctx, cancel := context.WithCancel(context.Background())
h.App.ReqCancelFunc.Put(sessionId, cancel)
// 回复消息
err = h.sendMessage(ctx, session, chatRole, message, client)
err = h.sendMessage(ctx, session, chatRole, utils.InterfaceToString(message.Content), client)
if err != nil {
logger.Error(err)
utils.ReplyChunkMessage(client, types.WsMessage{Type: types.WsEnd})
} else {
utils.ReplyChunkMessage(client, types.WsMessage{Type: types.WsEnd})
logger.Info("回答完毕: " + string(message))
logger.Infof("回答完毕: %v", message.Content)
}
}

11
web/src/views/ChatPlus.vue
View File

@ -543,6 +543,7 @@ const lineBuffer = ref(''); // 输出缓冲行
const socket = ref(null);
const activelyClose = ref(false); // 主动关闭
const canSend = ref(true);
const heartbeatHandle = ref(null)
const connect = function (chat_id, role_id) {
let isNewChat = false;
if (!chat_id) {
@ -589,6 +590,14 @@ const connect = function (chat_id, role_id) {
loadChatHistory(chat_id);
}
// 发送心跳消息
clearInterval(heartbeatHandle.value)
heartbeatHandle.value = setInterval(() => {
if (socket.value !== null) {
socket.value.send(JSON.stringify({type: "heartbeat", content: "ping"}))
}
}, 5000);
});
_socket.addEventListener('message', event => {
@ -718,7 +727,7 @@ const sendMessage = function () {
showHello.value = false
disableInput(false)
socket.value.send(prompt.value);
socket.value.send(JSON.stringify({type: "chat", content: prompt.value}));
previousText.value = prompt.value;
prompt.value = '';
return true;

11
web/src/views/mobile/ChatSession.vue
View File

@ -200,6 +200,7 @@ const lineBuffer = ref(''); // 输出缓冲行
const socket = ref(null);
const activelyClose = ref(false); // 主动关闭
const canSend = ref(true);
const heartbeatHandle = ref(null)
const connect = function (chat_id, role_id) {
let isNewChat = false;
if (!chat_id) {
@ -238,6 +239,14 @@ const connect = function (chat_id, role_id) {
orgContent: role.helloMsg,
})
}
// 发送心跳消息
clearInterval(heartbeatHandle.value)
heartbeatHandle.value = setInterval(() => {
if (socket.value !== null) {
socket.value.send(JSON.stringify({type: "heartbeat", content: "ping"}))
}
}, 5000);
});
_socket.addEventListener('message', event => {
@ -370,7 +379,7 @@ const sendMessage = () => {
})
disableInput(false)
socket.value.send(prompt.value);
socket.value.send(JSON.stringify({type: "chat", content: prompt.value}));
previousText.value = prompt.value;
prompt.value = '';
return true;