Merge branch 'v2' into wip2.7

This commit is contained in:
ikechan8370 2023-06-25 01:04:44 +08:00 committed by GitHub
commit 7f799b657c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 358 additions and 183 deletions

View file

@ -781,12 +781,12 @@ export class chatgpt extends plugin {
}
// 黑白名单过滤对话
let [whitelist, blacklist] = processList(Config.whitelist, Config.blacklist)
if (whitelist.length > 0) {
if (whitelist.join('').length > 0) {
if (e.isGroup && !whitelist.includes(e.group_id.toString())) return false
const list = whitelist.filter(elem => elem.startsWith('^')).map(elem => elem.slice(1))
if (!list.includes(e.sender.user_id.toString())) return false
}
if (blacklist.length > 0) {
if (blacklist.join('').length > 0) {
if (e.isGroup && blacklist.includes(e.group_id.toString())) return false
const list = blacklist.filter(elem => elem.startsWith('^')).map(elem => elem.slice(1))
if (list.includes(e.sender.user_id.toString())) return false

View file

@ -316,9 +316,7 @@ azure语音Azure 语音是微软 Azure 平台提供的一项语音服务,
roleList = getVoicevoxRoleList()
break
case 'azure':
if (matchCommand[2] === 'azure') {
roleList = getAzureRoleList()
}
break
default:
break
@ -1458,7 +1456,7 @@ Poe 模式会调用 Poe 中的 Claude-instant 进行对话。需要提供 Cookie
})
await redis.set('CHATGPT:USE', redisConfig.useMode)
}
await this.reply(await makeForwardMsg(this.e, changeConfig.map(msg => `修改项:${msg.item}\n旧数据\n\n${msg.url}\n\n新数据\n ${msg.url}`)))
await this.reply(await makeForwardMsg(this.e, changeConfig.map(msg => `修改项:${msg.item}\n旧数据\n\n${msg.old}\n\n新数据\n ${msg.value}`)))
} catch (error) {
console.error(error)
await e.reply('配置文件错误')

View file

@ -834,7 +834,7 @@ export function supportGuoba () {
setConfigData (data, { Result }) {
for (let [keyPath, value] of Object.entries(data)) {
// 处理黑名单
if (keyPath === 'blockWords' || keyPath === 'promptBlockWords' || keyPath === 'initiativeChatGroups') { value = value.toString().split(/[,;\|]/) }
if (keyPath === 'blacklist' || keyPath === 'whitelist' || keyPath === 'blockWords' || keyPath === 'promptBlockWords' || keyPath === 'initiativeChatGroups') { value = value.toString().split(/[,;\|]/) }
if (Config[keyPath] !== value) { Config[keyPath] = value }
}
// 正确储存azureRoleSelect结果

View file

@ -2,6 +2,7 @@ import fastify from 'fastify'
import fastifyCookie from '@fastify/cookie'
import cors from '@fastify/cors'
import fstatic from '@fastify/static'
import websocket from '@fastify/websocket'
import fs from 'fs'
import path from 'path'
@ -9,14 +10,17 @@ import os from 'os'
import schedule from 'node-schedule'
import { Config } from '../utils/config.js'
import { randomString, getPublicIP, getUserData } from '../utils/common.js'
import { UserInfo, GetUser } from './modules/user_data.js'
import { getPublicIP, getUserData } from '../utils/common.js'
import webRoute from './modules/web_route.js'
import webUser from './modules/user.js'
const __dirname = path.resolve()
const server = fastify({
logger: Config.debug
})
let usertoken = []
let Statistics = {
SystemAccess: {
count: 0,
@ -60,99 +64,24 @@ async function setUserData(qq, data) {
fs.writeFileSync(filepath, JSON.stringify(data))
}
export async function createServer() {
await server.register(cors, {
server.register(cors, {
origin: '*'
})
await server.register(fstatic, {
server.register(fstatic, {
root: path.join(__dirname, 'plugins/chatgpt-plugin/server/static/')
})
await server.register(fastifyCookie)
await server.get('/page/*', (request, reply) => {
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
})
await server.get('/help/*', (request, reply) => {
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
})
await server.get('/version', (request, reply) => {
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
})
await server.get('/auth/*', (request, reply) => {
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
})
await server.get('/admin*', (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
const user = usertoken.find(user => user.token === token)
if (!user) {
reply.redirect(301, '/auth/login')
}
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
})
await server.get('/admin/dashboard', (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
const user = usertoken.find(user => user.token === token)
if (!user) {
reply.redirect(301, '/auth/login')
}
if (user.autho === 'admin') {
reply.redirect(301, '/admin/settings')
}
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
})
await server.get('/admin/settings', (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
const user = usertoken.find(user => user.token === token)
if (!user || user.autho != 'admin') {
reply.redirect(301, '/admin/')
}
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
})
// 登录
server.post('/login', async (request, reply) => {
const body = request.body || {}
if (body.qq && body.passwd) {
const token = randomString(32)
if (body.qq == Bot.uin && await redis.get('CHATGPT:ADMIN_PASSWD') == body.passwd) {
usertoken.push({ user: body.qq, token, autho: 'admin' })
reply.setCookie('token', token, { path: '/' })
reply.send({ login: true, autho: 'admin', token: token })
} else {
const user = await getUserData(body.qq)
if (user.passwd != '' && user.passwd === body.passwd) {
usertoken.push({ user: body.qq, token, autho: 'user' })
reply.setCookie('token', token, { path: '/' })
reply.send({ login: true, autho: 'user', token: token })
} else {
reply.send({ login: false, err: `用户名密码错误,如果忘记密码请私聊机器人输入 ${body.qq == Bot.uin ? '#修改管理密码' : '#修改用户密码'} 进行修改` })
}
}
} else {
reply.send({ login: false, err: '未输入用户名或密码' })
server.register(websocket, {
cors: true,
options: {
maxPayload: 1048576
}
})
// 检查用户是否存在
server.post('/verify', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
let user = usertoken.find(user => user.token === token)
if (!user || token === 'unknown') {
reply.send({
verify: false,
})
return
}
reply.send({
verify: true,
user: user.user,
autho: user.autho
})
})
server.register(fastifyCookie)
server.register(webRoute)
server.register(webUser)
export async function createServer() {
// 页面数据获取
server.post('/page', async (request, reply) => {
const body = request.body || {}
@ -264,86 +193,11 @@ export async function createServer() {
reply.send(Statistics)
})
// 获取用户数据
server.post('/userData', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
let user = usertoken.find(user => user.token === token)
if (!user) user = { user: '' }
const userData = await getUserData(user.user)
reply.send({
chat: userData.chat || [],
mode: userData.mode || '',
cast: userData.cast || {
api: '', //API设定
bing: '', //必应设定
bing_resource: '', //必应扩展资料
slack: '', //Slack设定
}
})
})
// 删除用户
server.post('/deleteUser', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
let user = usertoken.find(user => user.token === token)
if (!user || user === 'unknown') {
reply.send({ state: false, error: '无效token' })
return
}
const filepath = `resources/ChatGPTCache/user/${user.user}.json`
fs.unlinkSync(filepath)
reply.send({ state: true })
})
// 修改密码
server.post('/changePassword', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
let user = usertoken.find(user => user.token === token)
if (!user || user === 'unknown') {
reply.send({ state: false, error: '无效的用户信息' })
return
}
const userData = await getUserData(user.user)
const body = request.body || {}
if (!body.newPasswd) {
reply.send({ state: false, error: '无效参数' })
return
}
if (body.passwd && body.passwd != userData.passwd) {
reply.send({ state: false, error: '原始密码错误' })
return
}
if (user.autho === 'admin') {
await redis.set('CHATGPT:ADMIN_PASSWD', body.newPasswd)
} else if (user.autho === 'user') {
const dir = 'resources/ChatGPTCache/user'
const filename = `${user.user}.json`
const filepath = path.join(dir, filename)
fs.mkdirSync(dir, { recursive: true })
if (fs.existsSync(filepath)) {
fs.readFile(filepath, 'utf8', (err, data) => {
if (err) {
console.error(err)
return
}
const config = JSON.parse(data)
config.passwd = body.newPasswd
fs.writeFile(filepath, JSON.stringify(config), 'utf8', (err) => {
if (err) {
console.error(err)
}
})
})
} else {
reply.send({ state: false, error: '错误的用户数据' })
return
}
}
reply.send({ state: true })
})
// 清除缓存数据
server.post('/cleanCache', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
let user = usertoken.find(user => user.token === token)
let user = UserInfo(token)
if (!user) user = { user: '' }
const userData = await getUserData(user.user)
const dir = 'resources/ChatGPTCache/page'
@ -356,11 +210,98 @@ export async function createServer() {
await setUserData(user.user, userData)
reply.send({ state: true })
})
let clients = []
// 获取消息
const wsFn = async (connection, request) => {
connection.socket.on('open', message => {
// 开始连接
console.log(`Received message: ${message}`)
const response = { data: 'hello, client' }
connection.socket.send(JSON.stringify(response))
})
connection.socket.on('message', async (message) => {
try {
const data = JSON.parse(message)
switch (data.command) {
case 'sendMsg': // 代理消息发送
if (!connection.login) {
await connection.socket.send(JSON.stringify({ command: data.command, state: false, error: '请先登录账号' }))
return
}
if (data.id && data.message) {
if (data.group) {
Bot.sendGroupMsg(parseInt(data.id), data.message, data.quotable)
} else {
Bot.sendPrivateMsg(parseInt(data.id), data.message, data.quotable)
}
await connection.socket.send(JSON.stringify({ command: data.command, state: true, }))
} else {
await connection.socket.send(JSON.stringify({ command: data.command, state: false, error: '参数不足' }))
}
break
case 'userInfo': // 获取用户信息
if (!connection.login) {
await connection.socket.send(JSON.stringify({ command: data.command, state: false, error: '请先登录账号' }))
} else {
await connection.socket.send(JSON.stringify({ command: data.command, state: true, user: { user: user.user, autho: user.autho } }))
}
break
case 'login': // 登录
const user = UserInfo(data.token)
if (user) {
clients[user.user] = connection.socket
connection.login = true
await connection.socket.send(JSON.stringify({ command: data.command, state: true }))
} else {
await connection.socket.send(JSON.stringify({ command: data.command, state: false, error: '权限验证失败' }))
}
break
default:
await connection.socket.send(JSON.stringify({ "data": data }))
break
}
} catch (error) {
await connection.socket.send(JSON.stringify({ "error": error.message }))
}
})
}
Bot.on("message", e => {
const messageData = {
notice: 'clientMessage',
message: e.message,
sender: e.sender,
group: {
isGroup: e.isGroup,
group_id: e.group_id,
group_name: e.group_name
},
quotable: {
user_id: e.user_id,
time: e.time,
seq: e.seq,
rand: e.rand,
message: e.message,
user_name: e.sender.nickname,
}
}
if (clients) {
for (const index in clients) {
const user = GetUser(index)
if (user.autho == 'admin' || user.user == e.user_id) {
clients[index].send(JSON.stringify(messageData))
}
}
}
})
server.get('/ws', {
websocket: true
}, wsFn)
// 获取系统参数
server.post('/sysconfig', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
const user = usertoken.find(user => user.token === token)
const user = UserInfo(token)
if (!user) {
reply.send({ err: '未登录' })
} else if (user.autho === 'admin') {
@ -405,7 +346,7 @@ export async function createServer() {
// 设置系统参数
server.post('/saveconfig', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
const user = usertoken.find(user => user.token === token)
const user = UserInfo(token)
const body = request.body || {}
let changeConfig = []
if (!user) {
@ -457,8 +398,18 @@ export async function createServer() {
if (redisConfig.openAiPlatformAccessToken != null) {
await redis.set('CHATGPT:TOKEN', redisConfig.openAiPlatformAccessToken)
}
reply.send({ change: changeConfig, state: true })
// 通知所有WS客户端刷新数据
if (clients) {
for (const index in clients) {
const user = GetUser(index)
if (user.autho == 'admin') {
clients[index].send(JSON.stringify({
notice: 'updateConfig'
}))
}
}
}
} else {
if (body.userSetting) {
await redis.set(`CHATGPT:USER:${user.user}`, JSON.stringify(body.userSetting))

127
server/modules/user.js Normal file
View file

@ -0,0 +1,127 @@
import { UserInfo, AddUser } from './user_data.js'
import { randomString, getUserData } from '../../utils/common.js'
import fs from 'fs'
async function User(fastify, options) {
// 登录
fastify.post('/login', async (request, reply) => {
const body = request.body || {}
if (body.qq && body.passwd) {
const token = randomString(32)
if (body.qq == Bot.uin && await redis.get('CHATGPT:ADMIN_PASSWD') == body.passwd) {
AddUser({ user: body.qq, token: token, autho: 'admin' })
reply.setCookie('token', token, { path: '/' })
reply.send({ login: true, autho: 'admin', token: token })
} else {
const user = await getUserData(body.qq)
if (user.passwd != '' && user.passwd === body.passwd) {
AddUser({ user: body.qq, token: token, autho: 'user' })
reply.setCookie('token', token, { path: '/' })
reply.send({ login: true, autho: 'user', token: token })
} else {
reply.send({ login: false, err: `用户名密码错误,如果忘记密码请私聊机器人输入 ${body.qq == Bot.uin ? '#修改管理密码' : '#修改用户密码'} 进行修改` })
}
}
} else {
reply.send({ login: false, err: '未输入用户名或密码' })
}
return reply
})
// 检查用户是否存在
fastify.post('/verify', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
const user = UserInfo(token)
if (!user || token === 'unknown') {
reply.send({
verify: false,
})
return
}
reply.send({
verify: true,
user: user.user,
autho: user.autho
})
return reply
})
// 获取用户数据
fastify.post('/userData', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
let user = UserInfo(token)
if (!user) user = { user: '' }
const userData = await getUserData(user.user)
reply.send({
chat: userData.chat || [],
mode: userData.mode || '',
cast: userData.cast || {
api: '', //API设定
bing: '', //必应设定
bing_resource: '', //必应扩展资料
slack: '', //Slack设定
}
})
return reply
})
// 删除用户
fastify.post('/deleteUser', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
const user = UserInfo(token)
if (!user || user === 'unknown') {
reply.send({ state: false, error: '无效token' })
return
}
const filepath = `resources/ChatGPTCache/user/${user.user}.json`
fs.unlinkSync(filepath)
reply.send({ state: true })
return reply
})
// 修改密码
fastify.post('/changePassword', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
const user = UserInfo(token)
if (!user || user === 'unknown') {
reply.send({ state: false, error: '无效的用户信息' })
return
}
const userData = await getUserData(user.user)
const body = request.body || {}
if (!body.newPasswd) {
reply.send({ state: false, error: '无效参数' })
return
}
if (body.passwd && body.passwd != userData.passwd) {
reply.send({ state: false, error: '原始密码错误' })
return
}
if (user.autho === 'admin') {
await redis.set('CHATGPT:ADMIN_PASSWD', body.newPasswd)
} else if (user.autho === 'user') {
const dir = 'resources/ChatGPTCache/user'
const filename = `${user.user}.json`
const filepath = path.join(dir, filename)
fs.mkdirSync(dir, { recursive: true })
if (fs.existsSync(filepath)) {
fs.readFile(filepath, 'utf8', (err, data) => {
if (err) {
console.error(err)
return
}
const config = JSON.parse(data)
config.passwd = body.newPasswd
fs.writeFile(filepath, JSON.stringify(config), 'utf8', (err) => {
if (err) {
console.error(err)
}
})
})
} else {
reply.send({ state: false, error: '错误的用户数据' })
return
}
}
reply.send({ state: true })
return reply
})
}
export default User

View file

@ -0,0 +1,41 @@
let users = {
user: []
}
export const UserData = new Proxy(users, {
set(target, property, value) {
target[property] = value
return true
}
})
// 获取用户信息
export function UserInfo(token) {
const userData = users.user.find(user => user.token.includes(token))
if (userData) {
return {
user: userData.user,
autho: userData.autho,
label: userData.label
}
} else {
return undefined
}
}
// 获取用户数据
export function GetUser(user) {
return users.user.find(user => user === user)
}
// 添加用户token
export function AddUser(data) {
const userIndex = users.user.findIndex(user => user === data.user)
if (userIndex >= 0) {
users.user[userIndex].token.push(data.token)
} else {
users.user.push({
user: data.user,
autho: data.autho,
token: [data.token],
label: data.label || '',
tiem: new Date()
})
}
}

View file

@ -0,0 +1,58 @@
import { UserInfo } from './user_data.js'
import fs from 'fs'
async function routes(fastify, options) {
fastify.get('/page/*', async (request, reply) => {
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
return reply
})
fastify.get('/help/*', async (request, reply) => {
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
})
fastify.get('/version', async (request, reply) => {
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
return reply
})
fastify.get('/auth/*', async (request, reply) => {
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
})
fastify.get('/admin*', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
const user = UserInfo(token)
if (!user) {
reply.redirect(301, '/auth/login')
}
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
return reply
})
fastify.get('/admin/dashboard', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
const user = UserInfo(token)
if (!user) {
reply.redirect(301, '/auth/login')
}
if (user.autho === 'admin') {
reply.redirect(301, '/admin/settings')
}
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
return reply
})
fastify.get('/admin/settings', async (request, reply) => {
const token = request.cookies.token || request.body?.token || 'unknown'
const user = UserInfo(token)
if (!user || user.autho != 'admin') {
reply.redirect(301, '/admin/')
}
const stream = fs.createReadStream('plugins/chatgpt-plugin/server/static/index.html')
reply.type('text/html').send(stream)
return reply
})
}
export default routes