Upload 44 files

Yunzai/.gitignore

@@ -137,7 +137,6 @@ config/test/*
 data/
 !config/test/default.yaml
 logs/
-resources/
 
 # Docker file
 redis

Yunzai/.npmrc

@@ -1,3 +1,5 @@
 registry=https://registry.npmmirror.com
 node_sqlite3_binary_host_mirror=https://npmmirror.com/mirrors/sqlite3
-canvas_binary_host_mirror=https://npmmirror.com/mirrors/canvas
+canvas_binary_host_mirror=https://npmmirror.com/mirrors/canvas
+sharp_binary_host=https://npmmirror.com/mirrors/sharp
+sharp_libvips_binary_host=https://npmmirror.com/mirrors/sharp-libvips

Yunzai/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 3.1.3
+
+* 支持协议端：QQBot
+* **请注意：**
+  * 从3.1.3版本开始，原genshin包内的功能会逐步重构，与miao-plugin进行整合，以降低后续游戏版本升级时的维护成本
+  * 在整合过程中，可能会移除一些重复或迁移成本较高的功能，以及可能会有功能不稳定情况
+  * 如介意，请切换至**v312-backup**分支
+
+# 3.1.2
+
+* 支持协议端：OPQBot
+* 新增`#绑定用户`命令
+  * 可将其他QQ绑定至当前用户，以打通多个用户，子用户使用主用户的CK与UID等信息
+  * 同时也可绑定其他平台的用户，例如频道、微信等。如需链接至其他平台需使用TRSS-Yunzai或Lain-plugin
+  * 部分命令可能无法识别绑定后的主用户，如遇问题可反馈
+
 # 3.1.1
 
 * 支持协议端：米游社大别野Bot

Yunzai/README.md

@@ -2,7 +2,7 @@
 
 # TRSS-Yunzai
 
-Yunzai 应用端，支持多账号，支持协议端：go-cqhttp、ComWeChat、GSUIDCore、ICQQ、QQ频道、微信、KOOK、Telegram、Discord
+Yunzai 应用端，支持多账号，支持协议端：go-cqhttp、ComWeChat、GSUIDCore、ICQQ、QQBot、QQ频道、微信、KOOK、Telegram、Discord、OPQBot
 
 [![访问量](https://visitor-badge.glitch.me/badge?page_id=TimeRainStarSky.Yunzai&right_color=red&left_text=访%20问%20量)](https://github.com/TimeRainStarSky/Yunzai)
 [![Stars](https://img.shields.io/github/stars/TimeRainStarSky/Yunzai?color=yellow&label=收藏)](../../stargazers)
@@ -118,6 +118,12 @@ ws://localhost:2536/GSUIDCore
 
 </details>
 
+<details><summary>QQBot</summary>
+
+[TRSS-Yunzai QQBot Plugin](../../../Yunzai-QQBot-Plugin)
+
+</details>
+
 <details><summary>QQ频道</summary>
 
 [TRSS-Yunzai QQGuild Plugin](../../../Yunzai-QQGuild-Plugin)
@@ -154,9 +160,19 @@ ws://localhost:2536/GSUIDCore
 
 </details>
 
-<details><summary>代理</summary>
+<details><summary>OPQBot</summary>
+
+下载运行 [OPQBot](https://opqbot.com)，启动参数添加：
+
+```
+-wsserver ws://localhost:2536/OPQBot
+```
+
+</details>
+
+<details><summary>路由</summary>
 
-[TRSS-Yunzai Proxy Plugin](../../../Yunzai-Proxy-Plugin)
+[TRSS-Yunzai Route Plugin](../../../Yunzai-Route-Plugin)
 
 </details>
 

Yunzai/lib/bot.js

@@ -7,48 +7,61 @@ import express from "express"
 import http from "http"
 import { WebSocketServer } from "ws"
 import _ from "lodash"
+import fs from "node:fs"
+import fetch from "node-fetch"
+import { randomUUID } from "node:crypto"
+import { exec } from "child_process"
+import { fileTypeFromBuffer } from "file-type"
+import md5 from "md5"
 
 export default class Yunzai extends EventEmitter {
   constructor() {
     super()
     this.uin = []
     this.adapter = []
+
     this.express = express()
     this.server = http.createServer(this.express)
-    this.server.on("upgrade", (req, socket, head) => {
-      this.wss.handleUpgrade(req, socket, head, conn => {
-        conn.id = `${req.connection.remoteAddress}-${req.headers["sec-websocket-key"]}`
-        this.makeLog("mark", `${logger.blue(`[${conn.id} <=> ${req.url}]`)} 建立连接：${JSON.stringify(req.headers)}`)
-        conn.on("error", logger.error)
-        conn.on("close", () => this.makeLog("mark", `${logger.blue(`[${conn.id} <≠> ${req.url}]`)} 断开连接`))
-        conn.on("message", msg => this.makeLog("debug", `${logger.blue(`[${conn.id} => ${req.url}]`)} 消息：${String(msg).trim()}`))
-        conn.sendMsg = msg => {
-          if (typeof msg == "object")
-            msg = JSON.stringify(msg)
-          this.makeLog("debug", `${logger.blue(`[${conn.id} <= ${req.url}]`)} 消息：${msg}`)
-          return conn.send(msg)
-        }
-        for (const i of this.wsf[req.url.split("/")[1]] || [])
-          i(conn, req, socket, head)
-      })
-    })
+
+    this.server.on("upgrade", (...args) => this.wsConnect(...args))
     this.wss = new WebSocketServer({ noServer: true })
     this.wsf = {}
+
+    this.fs = {}
+    this.express.use("/File", (...args) => this.fileSend(...args))
+    this.fileToUrl("resources/http/File/404.jpg", { name: 404, time: 0 })
+    this.fileToUrl("resources/http/File/timeout.jpg", { name: "timeout", time: 0 })
   }
 
-  makeLog(level, msg) {
-    logger[level](_.truncate(msg, { length: cfg.bot.logLength }))
+  wsConnect(req, socket, head) {
+    this.wss.handleUpgrade(req, socket, head, conn => {
+      conn.id = `${req.connection.remoteAddress}-${req.headers["sec-websocket-key"]}`
+      this.makeLog("mark", `${logger.blue(`[${conn.id} <=> ws://${req.headers.host}${req.url}]`)} 建立连接：${JSON.stringify(req.headers)}`)
+      conn.on("error", logger.error)
+      conn.on("close", () => this.makeLog("mark", `${logger.blue(`[${conn.id} <≠> ws://${req.headers.host}${req.url}]`)} 断开连接`))
+      conn.on("message", msg => this.makeLog("debug", `${logger.blue(`[${conn.id} => ws://${req.headers.host}${req.url}]`)} 消息：${String(msg).trim()}`))
+      conn.sendMsg = msg => {
+        if (!Buffer.isBuffer(msg)) msg = this.String(msg)
+        this.makeLog("debug", `${logger.blue(`[${conn.id} <= ws://${req.headers.host}${req.url}]`)} 消息：${msg}`)
+        return conn.send(msg)
+      }
+      for (const i of this.wsf[req.url.split("/")[1]] || [])
+        i(conn, req, socket, head)
+    })
   }
 
-  em(name = "", data = {}) {
-    if (data.self_id)
-      Object.defineProperty(data, "bot", { value: Bot[data.self_id] })
-    while (true) {
-      this.emit(name, data)
-      const i = name.lastIndexOf(".")
-      if (i == -1) break
-      name = name.slice(0, i)
-    }
+  serverLoad() {
+    this.express.use(req => {
+      logger.mark(`${logger.blue(`[${req.ip} => http://${req.headers.host}${req.url}]`)} HTTP ${req.method} 请求：${JSON.stringify(req.headers)}`)
+      req.res.redirect("https://github.com/TimeRainStarSky/Yunzai")
+    })
+
+    this.server.listen(cfg.bot.port, () => {
+      logger.mark(`启动 HTTP 服务器：${logger.green(`http://[${this.server.address().address}]:${this.server.address().port}`)}`)
+      const url = cfg.bot.url.replace(/^http/, "ws")
+      for (const i of Object.keys(this.wsf))
+        logger.info(`${i} 连接地址：${logger.blue(`${url}/${i}`)}`)
+    })
   }
 
   async run() {
@@ -59,21 +72,124 @@ export default class Yunzai extends EventEmitter {
     this.emit("online", this)
   }
 
-  serverLoad() {
-    this.express.use(req => {
-      logger.mark(`${logger.blue(`[${req.ip} => ${req.url}]`)} HTTP ${req.method} 请求：${JSON.stringify(req.headers)}`)
-      req.res.redirect("https://github.com/TimeRainStarSky/Yunzai")
-    })
+  sleep(time) {
+    return new Promise(resolve => setTimeout(resolve, time))
+  }
 
-    this.server.listen(cfg.bot.port, () => {
-      const host = this.server.address().address
-      const port = this.server.address().port
-      logger.mark(`启动 HTTP 服务器：${logger.green(`http://[${host}]:${port}`)}`)
-      for (const i of Object.keys(this.wsf))
-        logger.info(`本机 ${i} 连接地址：${logger.blue(`ws://localhost:${port}/${i}`)}`)
+  String(data) {
+    switch (typeof data) {
+      case "string":
+        return data
+      case "object":
+        return JSON.stringify(data)
+    }
+    return String(data)
+  }
+
+  Buffer(data, opts = {}) {
+    if (Buffer.isBuffer(data)) return data
+    data = this.String(data)
+
+    if (data.match(/^base64:\/\//)) {
+      return Buffer.from(data.replace(/^base64:\/\//, ""), "base64")
+    } else if (data.match(/^https?:\/\//)) {
+      if (opts.http) return data
+      return (async () => Buffer.from(await (await fetch(data)).arrayBuffer()))()
+    } else if (fs.existsSync(data.replace(/^file:\/\//, ""))) {
+      if (opts.file) return data
+      return Buffer.from(fs.readFileSync(data.replace(/^file:\/\//, "")))
+    }
+    return data
+  }
+
+  async fileType(data, name) {
+    const file = {}
+    try {
+      if (Buffer.isBuffer(data)) {
+        file.url = name || "Buffer"
+        file.buffer = data
+      } else {
+        file.url = data.replace(/^base64:\/\/.*/, "base64://...")
+        file.buffer = await this.Buffer(data)
+      }
+      if (Buffer.isBuffer(file.buffer)) {
+        file.type = await fileTypeFromBuffer(file.buffer)
+        file.md5 = md5(file.buffer)
+        file.name = name || `${Date.now()}.${file.md5.slice(0,8)}.${file.type.ext}`
+      } else {
+        file.name = name || `${Date.now()}-path.basename(file.buffer)`
+      }
+    } catch (err) {
+      logger.error(`文件类型检测错误：${logger.red(err)}`)
+    }
+    return file
+  }
+
+  async fileToUrl(file, opts = {}) {
+    const { name, time = 60000, times } = opts
+
+    file = await this.fileType(file, name)
+    if (!Buffer.isBuffer(file.buffer)) return file.buffer
+    if (!file.name) file.name = randomUUID()
+
+    if (typeof times == "number") file.times = times
+    this.fs[file.name] = file
+    if (time) setTimeout(() => this.fs[file.name] = this.fs.timeout, time)
+    return `${cfg.bot.url}/File/${file.name}`
+  }
+
+  fileSend(req) {
+    const url = req.url.replace(/^\//, "")
+    let file = this.fs[url]
+    if (!file) file = this.fs[404]
+
+    if (typeof file.times == "number") {
+      if (file.times > 0) file.times = file.times-1
+      else file = this.fs.timeout
+    }
+
+    if (file.type?.mime)
+      req.res.setHeader("Content-Type", file.type.mime)
+
+    logger.mark(`${logger.blue(`[${req.ip} => http://${req.headers.host}/File/${url}]`)} HTTP ${req.method} 请求：${JSON.stringify(req.headers)}`)
+    logger.mark(`${logger.blue(`[${req.ip} <= http://${req.headers.host}/File/${url}]`)} 发送文件：${file.name}(${file.url} ${(file.buffer.length/1024).toFixed(2)}KB)`)
+    req.res.send(file.buffer)
+  }
+
+  async exec(cmd) {
+    return new Promise(resolve => {
+      this.makeLog("mark", `[命令执行开始] ${logger.blue(cmd)}`)
+      exec(cmd, (error, stdout, stderr) => {
+        this.makeLog("mark", `[命令执行完成] ${logger.blue(cmd)}${stdout?`\n${this.String(stdout).trim()}`:""}${stderr?logger.red(`\n${this.String(stderr).trim()}`):""}`)
+        if (error) this.makeLog("mark", `[命令执行错误] ${logger.blue(cmd)}\n${logger.red(this.String(error).trim())}`)
+        resolve({ error, stdout, stderr })
+      })
     })
   }
 
+  makeLog(level, msg, id) {
+    const log = []
+    if (id) log.push(logger.blue(`[${id}]`))
+    for (const i of Array.isArray(msg) ? msg : [msg]) {
+      if (i?.replace)
+        log.push(_.truncate(i.replace(/{"type":"Buffer","data":\[.*?\]}/g, "(Buffer)"), { length: cfg.bot.log_length }))
+      else
+        log.push(i)
+    }
+    logger[level](...log)
+  }
+
+  em(name = "", data = {}) {
+    if (data.self_id)
+      Object.defineProperty(data, "bot", { value: Bot[data.self_id] })
+    while (true) {
+      this.emit(name, data)
+      const i = name.lastIndexOf(".")
+      if (i == -1) break
+      name = name.slice(0, i)
+    }
+  }
+
   getFriendArray() {
     const array = []
     for (const bot_id of this.uin)
@@ -185,7 +301,7 @@ export default class Yunzai extends EventEmitter {
     return false
   }
 
-  async getFriendMsg(fnc = () => true) {
+  async getTextMsg(fnc = () => true) {
     if (typeof fnc != "function") {
       const { self_id, user_id } = fnc
       fnc = data => data.self_id == self_id && data.user_id == user_id
@@ -210,7 +326,7 @@ export default class Yunzai extends EventEmitter {
   }
 
   getMasterMsg() {
-    return this.getFriendMsg(data =>
+    return this.getTextMsg(data =>
       cfg.master[data.self_id]?.includes(String(data.user_id)))
   }
 

Yunzai/lib/config/config.js

@@ -18,11 +18,11 @@ class Cfg {
     let path = "config/config/"
     let pathDef = "config/default_config/"
     const files = fs.readdirSync(pathDef).filter(file => file.endsWith(".yaml"))
-    for (let file of files)
+    for (const file of files)
       if (!fs.existsSync(`${path}${file}`))
         fs.copyFileSync(`${pathDef}${file}`, `${path}${file}`)
-    if (!fs.existsSync("data")) fs.mkdirSync("data")
-    if (!fs.existsSync("resources")) fs.mkdirSync("resources")
+    for (const i of ["data", "temp"])
+      if (!fs.existsSync(i)) fs.mkdirSync(i)
   }
 
   /** Bot配置 */
@@ -69,10 +69,12 @@ class Cfg {
     const masters = {}
     for (let i of master) {
       i = i.split(":")
-      if (Array.isArray(masters[i[0]]))
-        masters[i[0]].push(i[1])
+      const bot_id = i.shift()
+      const user_id = i.join(":")
+      if (Array.isArray(masters[bot_id]))
+        masters[bot_id].push(user_id)
       else
-        masters[i[0]] = [i[1]]
+        masters[bot_id] = [user_id]
     }
     return masters
   }

Yunzai/lib/config/init.js

@@ -1,28 +1,35 @@
-import setLog from './log.js'
-import redisInit from './redis.js'
-import { checkRun } from './check.js'
-import cfg from './config.js'
+import setLog from "./log.js"
+import redisInit from "./redis.js"
+import { checkRun } from "./check.js"
+import cfg from "./config.js"
 
 /** 设置标题 */
-process.title = 'TRSS Yunzai'
+process.title = `TRSS Yunzai v${cfg.package.version} © 2023 - 2024 TimeRainStarSky`
 
 /** 设置时区 */
-process.env.TZ = 'Asia/Shanghai'
+process.env.TZ = "Asia/Shanghai"
+
+/** 捕获未处理的错误 */
+process.on("uncaughtException", error => {
+  if (typeof logger == "undefined") console.log(error)
+  else logger.error(error)
+})
 
 /** 捕获未处理的Promise错误 */
-process.on('unhandledRejection', (error, promise) => {
-  if (logger) {
-    logger.error(error)
-  } else {
-    console.log(error)
-  }
+process.on("unhandledRejection", (error, promise) => {
+  if (typeof logger == "undefined") console.log(error)
+  else logger.error(error)
 })
 
 /** 退出事件 */
-process.on('exit', async code => {
-  if (typeof redis != 'undefined' && typeof test == 'undefined')
+process.on("exit", async code => {
+  if (typeof redis != "undefined" && typeof test == "undefined")
     await redis.save()
-  logger.mark(logger.magenta('TRSS-Yunzai 已停止运行'))
+
+  if (typeof logger == "undefined")
+    console.log("TRSS-Yunzai 已停止运行")
+  else
+    logger.mark(logger.magenta("TRSS-Yunzai 已停止运行"))
 })
 
 await checkInit()
@@ -32,11 +39,11 @@ async function checkInit() {
   /** 日志设置 */
   setLog()
 
-  logger.mark('----^_^----')
+  logger.mark("----^_^----")
   logger.mark(logger.yellow(`TRSS-Yunzai v${cfg.package.version} 启动中...`))
-  logger.mark(logger.cyan('https://github.com/TimeRainStarSky/Yunzai'))
+  logger.mark(logger.cyan("https://github.com/TimeRainStarSky/Yunzai"))
 
   await redisInit()
 
   checkRun()
-}
+}

Yunzai/lib/config/redis.js

@@ -44,6 +44,7 @@ export default async function redisInit() {
   })
 
   /** 全局变量 redis */
+  client.url = redisUrl
   global.redis = client
   logger.info("Redis 连接成功")
   return client

Yunzai/lib/events/connect.js

@@ -13,10 +13,10 @@ export default class connectEvent extends EventListener {
     if (!Bot.uin.includes(e.self_id))
       Bot.uin.push(e.self_id)
 
-    if (!cfg.bot.online_msg) return
+    if (!cfg.bot.online_msg_exp) return
     const key = `Yz:loginMsg:${e.self_id}`
     if (await redis.get(key)) return
-    redis.set(key, "1", { EX: cfg.bot.online_msg_exp })
+    redis.set(key, "1", { EX: cfg.bot.online_msg_exp*60 })
     for (const i of cfg.master[e.self_id] || [])
       e.bot.pickFriend(i).sendMsg(`欢迎使用【TRSS-Yunzai v${cfg.package.version}】\n【#帮助】查看指令说明\n【#状态】查看运行状态\n【#日志】查看运行日志\n【#重启】重新启动\n【#更新】拉取 Git 更新\n【#全部更新】更新全部插件\n【#更新日志】查看更新日志\n【#设置主人】设置主人账号\n【#安装插件】查看可安装插件`)
   }

Yunzai/lib/events/online.js

@@ -5,14 +5,14 @@ import cfg from '../config/config.js'
  * 监听上线事件
  */
 export default class onlineEvent extends EventListener {
-  constructor () {
+  constructor() {
     super({
       event: 'online',
       once: true
     })
   }
 
-  async execute () {
+  async execute() {
     logger.mark('----^_^----')
   }
 }

Yunzai/lib/modules/oicq/index.js

@@ -2,20 +2,12 @@ import fs from "node:fs"
 import path from "node:path"
 
 function toSegment(type, data) {
-  for (const i in data) {
-    switch (typeof data[i]) {
-      case "string":
-        if ((i == "file" || data[i].match(/^file:\/\//)) && fs.existsSync(data[i].replace(/^file:\/\//, ""))) {
-          if (i == "file" && !data.name)
-            data.name = path.basename(data[i])
-          data[i] = `base64://${fs.readFileSync(data[i].replace(/^file:\/\//, "")).toString("base64")}`
-        }
-        break
-      case "object":
-        if (Buffer.isBuffer(data[i]))
-          data[i] = `base64://${data[i].toString("base64")}`
+  for (const i in data)
+    if (typeof data[i] == "string" && (i == "file" || data[i].match(/^file:\/\//)) && fs.existsSync(data[i].replace(/^file:\/\//, ""))) {
+      if (i == "file" && !data.name)
+        data.name = `${Date.now()}-${path.basename(data[i])}`
+      data[i] = fs.readFileSync(data[i].replace(/^file:\/\//, ""))
     }
-  }
   return { type, ...data }
 }
 
@@ -23,6 +15,15 @@ const segment = new class segment {
   custom(type, data) {
     return toSegment(type, data)
   }
+  raw(data) {
+    return toSegment("raw", { data })
+  }
+  button(...data) {
+    return toSegment("button", { data })
+  }
+  markdown(data) {
+    return toSegment("markdown", { data })
+  }
   image(file, name) {
     return toSegment("image", { file, name })
   }

Yunzai/lib/plugins/loader.js

@@ -134,7 +134,7 @@ class PluginsLoader {
     for (let val of files) {
       let filepath = "../../plugins/" + val.name
       let tmp = {
-        name: val.name,
+        name: val.name
       }
       if (val.isFile()) {
         if (!val.name.endsWith(".js")) continue
@@ -229,8 +229,16 @@ class PluginsLoader {
 
     // 判断是否是星铁命令，若是星铁命令则标准化处理
     // e.isSr = true，且命令标准化为 #星铁 开头
+    Object.defineProperty(e, "isSr", {
+      get: () => e.game === "sr",
+      set: (v) => e.game = v ? "sr" : "gs"
+    })
+    Object.defineProperty(e, "isGs", {
+      get: () => e.game === "gs",
+      set: (v) => e.game = v ? "gs" : "sr"
+    })
     if (this.srReg.test(e.msg)) {
-      e.isSr = true
+      e.game = "sr"
       e.msg = e.msg.replace(this.srReg, "#星铁")
     }
 
@@ -260,7 +268,7 @@ class PluginsLoader {
             e.logFnc = `[${plugin.name}][${v.fnc}]`
 
             if (v.log !== false) {
-              logger.mark(`${e.logFnc}${e.logText} ${lodash.truncate(e.msg, { length: 80 })}`)
+              logger.info(`${e.logFnc}${e.logText} ${lodash.truncate(e.msg, { length: 80 })}`)
             }
 
             /** 判断权限 */
@@ -521,9 +529,7 @@ class PluginsLoader {
       try {
         res = await e.replyNew(msg)
       } catch (err) {
-        if (typeof msg != "string")
-          msg = lodash.truncate(JSON.stringify(msg), { length: 300 })
-        logger.error(`发送消息错误：${msg}`)
+        Bot.makeLog("error", `发送消息错误：${Bot.String(msg)}`, e.self_id)
         logger.error(err)
       }
 
@@ -631,25 +637,19 @@ class PluginsLoader {
     if (e.isGroup && e?.group?.mute_left > 0) return false
     if (!e.message || e.isPrivate) return true
 
-    let config = cfg.getGroup(e.self_id, e.group_id)
+    const config = cfg.getGroup(e.self_id, e.group_id)
 
-    if (config.groupCD && this.groupCD[e.group_id]) {
+    if (config.groupCD && this.groupCD[e.group_id])
       return false
-    }
-    if (config.singleCD && this.singleCD[`${e.group_id}.${e.user_id}`]) {
+
+    if (config.singleCD && this.singleCD[`${e.group_id}.${e.user_id}`])
       return false
-    }
 
-    let { msgThrottle } = this
+    const msgId = `${e.self_id}:${e.user_id}:${e.raw_message}`
+    if (this.msgThrottle[msgId]) return false
 
-    let msgId = e.user_id + ':' + e.raw_message
-    if (msgThrottle[msgId]) {
-      return false
-    }
-    msgThrottle[msgId] = true
-    setTimeout(() => {
-      delete msgThrottle[msgId]
-    }, 200)
+    this.msgThrottle[msgId] = true
+    setTimeout(() => delete this.msgThrottle[msgId], 1000)
 
     return true
   }

Yunzai/lib/plugins/plugin.js

@@ -1,3 +1,5 @@
+import { Common } from '#miao'
+
 let stateArr = {}
 
 export default class plugin {
@@ -116,4 +118,11 @@ export default class plugin {
       delete stateArr[this.conKey(isGroup)][type]
     }
   }
+
+  async renderImg (plugin, tpl, data, cfg) {
+    return Common.render(plugin, tpl, data, {
+      ...cfg,
+      e: this.e
+    })
+  }
 }

Yunzai/lib/plugins/runtime.js

@@ -77,7 +77,6 @@ export default class Runtime {
     await MysInfo.initCache()
     let runtime = new Runtime(e)
     e.runtime = runtime
-    e.game = e.isSr ? 'sr' : 'gs'
     await runtime.initUser()
     return runtime
   }
@@ -88,7 +87,7 @@ export default class Runtime {
     if (user) {
       e.user = new Proxy(user, {
         get (self, key, receiver) {
-          let game = e.isSr ? 'sr' : 'gs'
+          let game = e.game
           let fnMap = {
             uid: 'getUid',
             uidList: 'getUidList',
@@ -238,7 +237,11 @@ export default class Runtime {
     }
     let ret = true
     if (base64) {
-      ret = await this.e.reply(base64)
+      if (cfg.recallMsg) {
+        ret = await this.e.reply(base64, false, {})
+      } else {
+        ret = await this.e.reply(base64)
+      }
     }
     return cfg.retType === 'msgId' ? ret : true
   }

Yunzai/lib/plugins/stdin.js

@@ -1,8 +1,6 @@
-import fetch from "node-fetch"
 import fs from "node:fs"
 import path from "node:path"
 import common from "../common/common.js"
-import { fileTypeFromBuffer } from "file-type"
 
 Bot.adapter.push(new class stdinAdapter {
   constructor() {
@@ -12,59 +10,36 @@ Bot.adapter.push(new class stdinAdapter {
     common.mkdirs(this.path)
   }
 
-  async makeBuffer(file) {
-    if (file.match(/^base64:\/\//))
-      return Buffer.from(file.replace(/^base64:\/\//, ""), "base64")
-    else if (file.match(/^https?:\/\//))
-      return Buffer.from(await (await fetch(file)).arrayBuffer())
-    else if (fs.existsSync(file))
-      return Buffer.from(fs.readFileSync(file))
-    return file
-  }
-
-  async fileType(data) {
-    const file = {}
-    try {
-      file.url = data.replace(/^base64:\/\/.*/, "base64://...")
-      file.buffer = await this.makeBuffer(data)
-      file.type = await fileTypeFromBuffer(file.buffer)
-      file.path = `${this.path}${Date.now()}.${file.type.ext}`
-    } catch (err) {
-      logger.error(`文件类型检测错误：${logger.red(err)}`)
-    }
-    return file
-  }
-
   async sendMsg(msg) {
     if (!Array.isArray(msg))
       msg = [msg]
     for (let i of msg) {
       if (typeof i != "object")
-        i = { type: "text", data: { text: i }}
-      else if (!i.data)
-        i = { type: i.type, data: { ...i, type: undefined }}
+        i = { type: "text", text: i }
 
       let file
-      if (i.data.file)
-        file = await this.fileType(i.data.file)
+      if (i.file) {
+        file = await Bot.fileType(i.file, i.name)
+        if (Buffer.isBuffer(file.buffer)) {
+          file.path = `${this.path}${file.name || Date.now()}`
+          fs.writeFileSync(file.path, file.buffer)
+        }
+      }
 
       switch (i.type) {
         case "text":
-          if (i.data.text.match("\n"))
-            i.data.text = `\n${i.data.text}`
-          logger.info(`${logger.blue(`[${this.id}]`)} 发送文本：${i.data.text}`)
+          if (i.text.match("\n"))
+            i.text = `\n${i.text}`
+          logger.info(`${logger.blue(`[${this.id}]`)} 发送文本：${i.text}`)
           break
         case "image":
           logger.info(`${logger.blue(`[${this.id}]`)} 发送图片：${file.url}\n文件已保存到：${logger.cyan(file.path)}`)
-          fs.writeFileSync(file.path, file.buffer)
           break
         case "record":
           logger.info(`${logger.blue(`[${this.id}]`)} 发送音频：${file.url}\n文件已保存到：${logger.cyan(file.path)}`)
-          fs.writeFileSync(file.path, file.buffer)
           break
         case "video":
           logger.info(`${logger.blue(`[${this.id}]`)} 发送视频：${file.url}\n文件已保存到：${logger.cyan(file.path)}`)
-          fs.writeFileSync(file.path, file.buffer)
           break
         case "reply":
           break
@@ -88,7 +63,7 @@ Bot.adapter.push(new class stdinAdapter {
   }
 
   async sendFile(file, name = path.basename(file)) {
-    const buffer = await this.makeBuffer(file)
+    const buffer = await Bot.Buffer(file)
     if (!Buffer.isBuffer(buffer)) {
       logger.error(`${logger.blue(`[${this.id}]`)} 发送文件错误：找不到文件 ${logger.red(file)}`)
       return false

Yunzai/lib/tools/log.js

@@ -0,0 +1,34 @@
+import fs from "node:fs"
+import childProcess from "child_process"
+
+const _path = process.cwd()
+
+fs.readFile(`${_path}/config/pm2/pm2.json`, `utf8`, (err, data) => {
+    if (err) {
+        console.log('pm2.json文件读取错误:', err)
+        return
+    }
+
+    try {
+        const config = JSON.parse(data)
+        if (config.apps && config.apps.length > 0 && config.apps[0].name) {
+            const appName = config.apps[0].name
+            runPm2Logs(appName)
+        } else {
+            console.log('读取失败：无法在pm2.json中找到name数组')
+        }
+    } catch (parseError) {
+        console.log('读取失败：json文件解析发生了错误', parseError)
+    }
+})
+
+function runPm2Logs(appName) {
+    const command = process.platform === 'win32' ? 'pm2.cmd' : 'pm2'
+    const args = ['logs', '--lines', '400', appName]
+    const pm2LogsProcess = childProcess.spawn(command, args, { stdio: 'inherit' })
+    pm2LogsProcess.on('exit', (code) => {
+        if (code !== 0) {
+            console.error(`pm2 logs process exited with code ${code}`)
+        }
+    })
+}

Yunzai/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trss-yunzai",
-  "version": "3.1.0",
+  "version": "3.1.3",
   "author": "TimeRainStarSky, Yoimiya-Kokomi, Le-niao",
   "description": "Bot",
   "main": "app.js",
@@ -13,37 +13,36 @@
     "start": "pm2 start ./config/pm2/pm2.json",
     "stop": "pm2 stop ./config/pm2/pm2.json",
     "restart": "pm2 restart ./config/pm2/pm2.json",
-    "log": "node ./lib/tools/name.js"
+    "log": "node ./lib/tools/log.js"
   },
   "dependencies": {
     "art-template": "^4.13.2",
     "chalk": "^5.3.0",
     "chokidar": "^3.5.3",
     "express": "^4.18.2",
-    "file-type": "^18.5.0",
+    "file-type": "^18.7.0",
     "https-proxy-agent": "7.0.2",
     "image-size": "^1.0.2",
     "lodash": "^4.17.21",
     "log4js": "^6.9.1",
     "md5": "^2.3.0",
-    "moment": "^2.29.4",
+    "moment": "^2.30.1",
     "node-fetch": "^3.3.2",
     "node-schedule": "^2.1.1",
-    "node-xlsx": "^0.23.0",
     "oicq": "link:lib/modules/oicq",
     "pm2": "^5.3.0",
-    "puppeteer": "^21.3.8",
-    "redis": "^4.6.10",
-    "sequelize": "^6.33.0",
+    "puppeteer": "^21.6.1",
+    "redis": "^4.6.12",
+    "sequelize": "^6.35.2",
     "sqlite3": "^5.1.6",
-    "ws": "^8.14.2",
-    "yaml": "^2.3.3"
+    "ws": "^8.16.0",
+    "yaml": "^2.3.4"
   },
   "devDependencies": {
-    "eslint": "^8.51.0",
+    "eslint": "^8.56.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-n": "^16.2.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-n": "^16.5.0",
     "eslint-plugin-promise": "^6.1.1"
   },
   "imports": {