|
@@ -67,6 +67,9 @@ function getOneBotConfig(kind = BOT_KIND_WORKORDER) {
|
|
|
reverseWsPath: onebot.reverseWsPath || '',
|
|
reverseWsPath: onebot.reverseWsPath || '',
|
|
|
reverseWsToken: onebot.reverseWsToken || '',
|
|
reverseWsToken: onebot.reverseWsToken || '',
|
|
|
callbackToken: onebot.callbackToken || '',
|
|
callbackToken: onebot.callbackToken || '',
|
|
|
|
|
+ eventClientRole: onebot.eventClientRole || 'Universal',
|
|
|
|
|
+ apiClientRole: onebot.apiClientRole || 'Api',
|
|
|
|
|
+ enableApiWs: onebot.enableApiWs !== false,
|
|
|
ticketSenderNickname: onebot.ticketSenderNickname || defaults.senderNickname,
|
|
ticketSenderNickname: onebot.ticketSenderNickname || defaults.senderNickname,
|
|
|
chatSenderNickname: onebot.chatSenderNickname || onebot.ticketSenderNickname || defaults.senderNickname,
|
|
chatSenderNickname: onebot.chatSenderNickname || onebot.ticketSenderNickname || defaults.senderNickname,
|
|
|
selfId: onebot.selfId || '',
|
|
selfId: onebot.selfId || '',
|
|
@@ -166,8 +169,8 @@ async function connectReverseWs(kind = BOT_KIND_WORKORDER) {
|
|
|
if (!selfIdStr) throw new Error(`${getBotLabel(kind)} selfId is empty`)
|
|
if (!selfIdStr) throw new Error(`${getBotLabel(kind)} selfId is empty`)
|
|
|
|
|
|
|
|
const headers = {
|
|
const headers = {
|
|
|
- 'User-Agent': `runforge/1.0 (${kind}-onebot-v11-reverse-ws-client)`,
|
|
|
|
|
- 'X-Client-Role': `${kind}:event`,
|
|
|
|
|
|
|
+ 'User-Agent': 'runforge/1.0 (OneBot-v11-reverse-ws-client)',
|
|
|
|
|
+ 'X-Client-Role': onebot.eventClientRole,
|
|
|
'X-Self-ID': selfIdStr
|
|
'X-Self-ID': selfIdStr
|
|
|
}
|
|
}
|
|
|
if (onebot.reverseWsToken) headers.Authorization = `Bearer ${onebot.reverseWsToken}`
|
|
if (onebot.reverseWsToken) headers.Authorization = `Bearer ${onebot.reverseWsToken}`
|
|
@@ -251,8 +254,8 @@ async function connectApiReverseWs(kind = BOT_KIND_WORKORDER) {
|
|
|
if (!selfIdStr) throw new Error(`${getBotLabel(kind)} API ws selfId is empty`)
|
|
if (!selfIdStr) throw new Error(`${getBotLabel(kind)} API ws selfId is empty`)
|
|
|
|
|
|
|
|
const headers = {
|
|
const headers = {
|
|
|
- 'User-Agent': `runforge/1.0 (${kind}-onebot-v11-reverse-ws-api-client)`,
|
|
|
|
|
- 'X-Client-Role': `${kind}:api`,
|
|
|
|
|
|
|
+ 'User-Agent': 'runforge/1.0 (OneBot-v11-reverse-ws-api-client)',
|
|
|
|
|
+ 'X-Client-Role': onebot.apiClientRole,
|
|
|
'X-Self-ID': selfIdStr
|
|
'X-Self-ID': selfIdStr
|
|
|
}
|
|
}
|
|
|
if (onebot.reverseWsToken) headers.Authorization = `Bearer ${onebot.reverseWsToken}`
|
|
if (onebot.reverseWsToken) headers.Authorization = `Bearer ${onebot.reverseWsToken}`
|
|
@@ -563,7 +566,11 @@ async function initOneBotKind(kind) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
await connectReverseWs(kind)
|
|
await connectReverseWs(kind)
|
|
|
- await connectApiReverseWs(kind)
|
|
|
|
|
|
|
+ if (onebot.enableApiWs) {
|
|
|
|
|
+ await connectApiReverseWs(kind)
|
|
|
|
|
+ } else {
|
|
|
|
|
+ logger.info(`${getBotLabel(kind)} API ws disabled by config`)
|
|
|
|
|
+ }
|
|
|
return true
|
|
return true
|
|
|
}
|
|
}
|
|
|
|
|
|