feat(circle): 集成HaveADrink SDK实现酒友圈功能
- 集成HaveADrink SDK版本从1.0.4升级至1.0.8 - 实现酒友圈API接口,替换原有的mock数据 - 添加地理位置权限配置(requiredPrivateInfos) - 重构API调用方式,统一使用client实例调用真实接口 - 更新WebSocket协议与SDK保持一致,支持聊天、输入状态、已读回执等功能 - 实现游标分页获取动态信息流 - 添加文件上传API支持图片上传 - 优化API错误处理,支持业务级错误提示 - 调整酒局状态显示,新增upcoming待开始状态 - 优化自我感觉标签映射逻辑,支持更多状态类型 - 更新websocket连接认证方式,使用Authorization header传递token - 添加服务端连接确认和被踢下线事件处理
This commit is contained in:
+57
-22
@@ -1,9 +1,29 @@
|
||||
/* 碰盏日记 - WebSocket 管理器
|
||||
* 单例模式,负责私信实时通信
|
||||
* 协议格式与 HaveADrink SDK ChatWebSocket 一致:{ mesgType, data }
|
||||
* 支持心跳、自动重连、消息队列
|
||||
*/
|
||||
|
||||
const WS_HOST = 'wss://dev.wash-painting.cn/ws'
|
||||
const WS_HOST = 'wss://dev.wash-painting.cn/api/have_a_drink/v1/chat/chat'
|
||||
|
||||
// 客户端消息类型(与 SDK ClientMesgType 枚举值一致)
|
||||
const ClientMesgType = {
|
||||
Chat: 'chat',
|
||||
Typing: 'typing',
|
||||
Read: 'read',
|
||||
Ping: 'ping'
|
||||
}
|
||||
|
||||
// 服务端消息类型(与 SDK ServerMesgType 枚举值一致)
|
||||
const ServerMesgType = {
|
||||
Chat: 'chat',
|
||||
Typing: 'typing',
|
||||
Read: 'read',
|
||||
Ack: 'ack',
|
||||
Pong: 'pong',
|
||||
Connected: 'connected',
|
||||
Kicked: 'kicked'
|
||||
}
|
||||
|
||||
class WebSocketManager {
|
||||
constructor() {
|
||||
@@ -21,6 +41,7 @@ class WebSocketManager {
|
||||
this.heartbeatWait = 60000 // 60s 无 pong 则重连
|
||||
this.manualClose = false
|
||||
this.token = ''
|
||||
this.userId = '' // 连接成功后服务端返回的用户ID
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -37,11 +58,14 @@ class WebSocketManager {
|
||||
this.manualClose = false
|
||||
this.isConnecting = true
|
||||
|
||||
const url = `${WS_HOST}?token=${this.token}`
|
||||
console.log('[WS] 正在连接...', url)
|
||||
const url = WS_HOST
|
||||
console.log('[WS] 正在连接...')
|
||||
|
||||
this.socketTask = uni.connectSocket({
|
||||
url,
|
||||
header: {
|
||||
'Authorization': `Bearer ${this.token}`
|
||||
},
|
||||
complete: () => {}
|
||||
})
|
||||
|
||||
@@ -95,17 +119,17 @@ class WebSocketManager {
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送消息
|
||||
* @param {string} type - 消息类型: chat | typing | read | ping
|
||||
* 发送消息(与 SDK writeClient* 方法格式一致)
|
||||
* @param {string} mesgType - 消息类型: chat | typing | read | ping
|
||||
* @param {object} data - 消息数据
|
||||
*/
|
||||
send(type, data = {}) {
|
||||
const payload = JSON.stringify({ type, data, ts: Date.now() })
|
||||
send(mesgType, data = {}) {
|
||||
const payload = JSON.stringify({ mesgType, data })
|
||||
if (this.isConnected && this.socketTask) {
|
||||
this.socketTask.send({ data: payload })
|
||||
} else {
|
||||
// 断线暂存队列
|
||||
if (type !== 'ping') {
|
||||
// 断线暂存队列(ping 不暂存)
|
||||
if (mesgType !== ClientMesgType.Ping) {
|
||||
this.messageQueue.push(payload)
|
||||
}
|
||||
// 尝试重连
|
||||
@@ -117,7 +141,7 @@ class WebSocketManager {
|
||||
|
||||
/**
|
||||
* 订阅事件
|
||||
* @param {string} event - message | typing | read | ack | connect | disconnect
|
||||
* @param {string} event - message | typing | read | ack | connected | kicked | connect | disconnect
|
||||
* @param {function} callback
|
||||
*/
|
||||
on(event, callback) {
|
||||
@@ -143,27 +167,38 @@ class WebSocketManager {
|
||||
|
||||
// ========== 内部方法 ==========
|
||||
|
||||
/** 处理收到的消息 */
|
||||
/** 处理收到的消息(SDK ServerMesgType 协议) */
|
||||
_handleMessage(msg) {
|
||||
const { type, data } = msg
|
||||
switch (type) {
|
||||
case 'pong':
|
||||
this._onPong()
|
||||
break
|
||||
case 'chat':
|
||||
const { mesgType, data } = msg
|
||||
switch (mesgType) {
|
||||
case ServerMesgType.Chat:
|
||||
this._emit('message', data)
|
||||
break
|
||||
case 'typing':
|
||||
case ServerMesgType.Typing:
|
||||
this._emit('typing', data)
|
||||
break
|
||||
case 'read':
|
||||
case ServerMesgType.Read:
|
||||
this._emit('read', data)
|
||||
break
|
||||
case 'ack':
|
||||
case ServerMesgType.Ack:
|
||||
this._emit('ack', data)
|
||||
break
|
||||
case ServerMesgType.Pong:
|
||||
this._onPong()
|
||||
break
|
||||
case ServerMesgType.Connected:
|
||||
// 服务端验证 token 成功后推送,携带 userId
|
||||
this.userId = data && data.userId ? data.userId : ''
|
||||
console.log('[WS] 服务端确认连接, userId:', this.userId)
|
||||
this._emit('connected', data)
|
||||
break
|
||||
case ServerMesgType.Kicked:
|
||||
console.warn('[WS] 被踢下线')
|
||||
this._emit('kicked', data)
|
||||
this.disconnect()
|
||||
break
|
||||
default:
|
||||
console.log('[WS] 未知消息类型', type)
|
||||
console.log('[WS] 未知消息类型', mesgType)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -181,7 +216,7 @@ class WebSocketManager {
|
||||
_startHeartbeat() {
|
||||
this._stopHeartbeat()
|
||||
this.heartbeatTimer = setInterval(() => {
|
||||
this.send('ping')
|
||||
this.send(ClientMesgType.Ping, {})
|
||||
// 设置超时检测
|
||||
this.heartbeatTimeout = setTimeout(() => {
|
||||
console.warn('[WS] 心跳超时,触发重连')
|
||||
|
||||
Reference in New Issue
Block a user