This commit is contained in:
ikechan8370 2025-02-12 15:25:47 +08:00
parent b95bacc7e8
commit 4a3090c6f9
3 changed files with 20 additions and 11 deletions

View file

@ -1,4 +1,5 @@
import WebSocket from 'ws' import WebSocket from 'ws'
import crypto from 'crypto'
import common from '../../../lib/common/common.js' import common from '../../../lib/common/common.js'
import _ from 'lodash' import _ from 'lodash'
import { pTimeout } from '../utils/common.js' import { pTimeout } from '../utils/common.js'
@ -271,19 +272,27 @@ export class BingAIClient {
throw new Error('max retry exceed, maybe refresh token error') throw new Error('max retry exceed, maybe refresh token error')
} }
const url = `${this.baseUrl}/c/api/conversations` const url = `${this.baseUrl}/c/api/conversations`
const headers = {
// authorization: `Bearer ${this.accessToken}`,
'content-type': 'application/json',
origin: 'https://copilot.microsoft.com',
referer: 'https://copilot.microsoft.com/',
'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36 Edg/132.0.0.0'
}
if (this.accessToken) {
headers.authorization = `Bearer ${this.accessToken}`
}
const createConversationRsp = await fetch(url, { const createConversationRsp = await fetch(url, {
headers: { headers,
authorization: `Bearer ${this.accessToken}`,
'content-type': 'application/json',
origin: 'https://copilot.microsoft.com',
referer: 'https://copilot.microsoft.com/',
'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36 Edg/132.0.0.0'
},
method: 'POST' method: 'POST'
}) })
if (createConversationRsp.status === 401) { if (createConversationRsp.status === 401) {
await this.doRefreshToken() if (this.refreshToken) {
return await this._generateConversationId(times - 1) await this.doRefreshToken()
return await this._generateConversationId(times - 1)
} else {
this.accessToken = null
}
} }
const conversation = await createConversationRsp.json() const conversation = await createConversationRsp.json()
return conversation.id return conversation.id

View file

@ -5,7 +5,7 @@ export async function getChatHistoryGroup (e, num) {
// if (e.adapter === 'shamrock') { // if (e.adapter === 'shamrock') {
// return await e.group.getChatHistory(0, num, false) // return await e.group.getChatHistory(0, num, false)
// } else { // } else {
let latestChats = await e.group.getChatHistory(0, 1) let latestChats = await e.group.getChatHistory(e.seq || e.message_id, 1)
if (latestChats.length > 0) { if (latestChats.length > 0) {
let latestChat = latestChats[0] let latestChat = latestChats[0]
if (latestChat) { if (latestChat) {

View file

@ -8,7 +8,7 @@ class Tokenizer {
throw new Error('no valid group id') throw new Error('no valid group id')
} }
let group = e.bot.pickGroup(groupId, true) let group = e.bot.pickGroup(groupId, true)
let latestChat = await group.getChatHistory(0, 1) let latestChat = await group.getChatHistory(undefined, 1)
let seq = latestChat[0].seq let seq = latestChat[0].seq
let chats = latestChat let chats = latestChat
function compareByTime (a, b) { function compareByTime (a, b) {