Upload 75 files

Yunzai/.gitignore

@@ -1,148 +1,7 @@
-# Logs
+config/*.yaml
+data
 logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-.pnpm-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# Snowpack dependency directory (https://snowpack.dev/)
-web_modules/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional stylelint cache
-.stylelintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variable files
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-.parcel-cache
-
-# Next.js build output
-.next
-out
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and not Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# vuepress v2.x temp and cache directory
-.temp
-.cache
-
-# Docusaurus cache and generated files
-.docusaurus
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-.vscode-test
-.vscode/
-
-# yarn v2
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*
-
-# Yunzai data
+node_modules
+temp
 dump.rdb
-config/*.yaml
-config/test/*
-data/
-!config/test/default.yaml
-logs/
-
-# Docker file
-redis
-yunzai
-/.idea/
-/data/
-/temp/
-/pnpm-lock.yaml
-/entrypoint.sh
+pnpm-lock.yaml

Yunzai/.puppeteerrc.cjs

@@ -33,7 +33,7 @@ if (!executablePath) for (const item of [
 }
 
 if (executablePath || arch == "arm64" || arch == "aarch64") {
-  (typeof logger == "object" ? logger : console).info(`[Chromium] ${executablePath}`)
+  (typeof logger != "undefined" ? logger : console).info(`[Chromium] ${executablePath}`)
   skipDownload = true
 }
 

Yunzai/README.md

@@ -25,16 +25,18 @@ Yunzai 应用端，支持多账号，支持协议端：OneBotv11、ComWeChat、G
 
 项目仅供学习交流使用，严禁用于任何商业用途和非法行为
 
-## 使用方法
+## 安装教程
 
-### 建议使用 TRSS Script 一键安装管理
+<details><summary>脚本安装</summary>
 
 - [🌌 TRSS](https://TRSS.me)
 - [🔼 Vercel](https://TRSS-Script.Vercel.app)
 - [🐱 GitHub](https://TimeRainStarSky.GitHub.io/TRSS_Script)
 - [🇬 Gitee](https://Gitee.com/TimeRainStarSky/TRSS_Script)
 
-### 手动安装
+</details>
+
+<details><summary>手动安装</summary>
 
 > 环境准备：Windows/Linux/MacOS/Android  
 > [Node.js(>=v21)](https://nodejs.org), [Redis](https://redis.io), [Git](https://git-scm.com), [Chrome(可选)](https://google.cn/chrome)
@@ -49,35 +51,86 @@ git clone --depth 1 https://gitee.com/TimeRainStarSky/Yunzai
 cd Yunzai
 ```
 
-2. 推荐安装插件(可选)
+2. 安装 [pnpm](https://pnpm.io/zh/installation) 和依赖
 
 ```sh
-git clone --depth 1 https://github.com/TimeRainStarSky/Yunzai-genshin plugins/genshin
-git clone --depth 1 https://github.com/yoimiya-kokomi/miao-plugin plugins/miao-plugin
-git clone --depth 1 https://github.com/TimeRainStarSky/TRSS-Plugin plugins/TRSS-Plugin
+npm i -g pnpm
+pnpm i
 ```
 
+3. 前台运行
+
+| 操作 | 命令 |
+| ---- | ---- |
+| 启动 | node . |
+| 停止 | node . stop |
+
+4. 使用 [pm2](https://pm2.keymetrics.io) 后台运行
+
+| 操作 | 命令 |
+| ---- | ---- |
+| 启动 | pnpm start |
+| 停止 | pnpm stop |
+| 日志 | pnpm log |
+
+5. 开机自启
+
 ```sh
-git clone --depth 1 https://gitee.com/TimeRainStarSky/Yunzai-genshin plugins/genshin
-git clone --depth 1 https://gitee.com/yoimiya-kokomi/miao-plugin plugins/miao-plugin
-git clone --depth 1 https://Yunzai.TRSS.me plugins/TRSS-Plugin
+pnpm start
+pnpm pm2 save
+pnpm pm2 startup
 ```
 
-3. 安装 [pnpm](https://pnpm.io/zh/installation) 和依赖
+</details>
+
+<details><summary>Docker 安装</summary>
 
 ```sh
-npm i -g pnpm
-pnpm i
+bash <(curl -L https://github.com/TimeRainStarSky/Yunzai/raw/main/lib/tools/docker.sh)
+bash <(curl -L https://gitee.com/TimeRainStarSky/Yunzai/raw/main/lib/tools/docker.sh)
 ```
 
-4. 前台运行
+| 参数 | 描述 | 默认值 |
+| ---- | ---- | ------ |
+| DIR | 安装文件夹 | $HOME/Yunzai |
+| CMD | 启动命令 | tsyz |
+| CMDPATH | 命令文件夹 | /usr/local/bin |
+| DKNAME | 容器名 | Yunzai |
+| DKURL | Docker 源 | docker.nju.edu.cn |
+| GITURL | GIT 源 | https://gitee.com/TimeRainStarSky/Yunzai |
+| APTURL | APT 源 | mirrors.ustc.edu.cn |
+| APTDEP | APT 依赖 | chromium fonts-lxgw-wenkai fonts-noto-color-emoji |
+| NPMURL | NPM 源 | https://registry.npmmirror.com |
+
+- 参数修改方法
+
+```sh
+参数1="值1" 参数2="值2" bash <(x)
+```
 
 | 操作 | 命令 |
 | ---- | ---- |
-| 启动 | node . |
-| 停止 | node . stop |
+| 连接 | tsyz |
+| 断开 | Ctrl+P+Q |
+| 启动 | tsyz start |
+| 重启 | tsyz restart |
+| 停止 | tsyz stop |
+| 日志 | tsyz log 行数 |
+| 命令 | tsyz 命令 |
+
+</details>
 
-5. 启动协议端
+## 使用教程
+
+1. 推荐安装插件(可选)
+
+```
+#安装genshin
+#安装miao-plugin
+#安装TRSS-Plugin
+```
+
+2. 启动协议端
 
 <details><summary>WebSocket</summary><blockquote>
 
@@ -182,23 +235,7 @@ ws://localhost:2536/GSUIDCore
 
 </details>
 
-6. 设置主人：发送 `#设置主人`，日志获取验证码并发送
-
-7. 使用 [pm2](https://pm2.keymetrics.io) 后台运行
-
-| 操作 | 命令 |
-| ---- | ---- |
-| 启动 | pnpm start |
-| 停止 | pnpm stop |
-| 日志 | pnpm log |
-
-8. 开机自启
-
-```sh
-pnpm start
-pnpm pm2 save
-pnpm pm2 startup
-```
+3. 设置主人：发送 `#设置主人`，日志获取验证码并发送
 
 ## 班级群(¿
 

Yunzai/app.js

@@ -9,7 +9,7 @@ switch (process.env.app_type || process.argv[2]) {
     const fetch = (await import("node-fetch")).default
     try {
       await fetch(`http://localhost:${cfg.bot.port}/exit`)
-    } catch (err) {}
+    } catch {}
     process.exit()
   } default: {
     const { spawnSync } = await import("node:child_process")

Yunzai/config/default_config/bot.yaml

@@ -14,6 +14,15 @@ port: 2536
 update_time: 1440
 # 自动重启时间
 restart_time: 0
+# 定时更新cron表达式
+update_cron:
+# 定时重启cron表达式
+restart_cron:
+# 定时关机cron表达式
+stop_cron:
+# 定时开机cron表达式
+start_cron:
+
 # 上线推送通知的冷却时间
 online_msg_exp: 1440
 # 文件保存时间

Yunzai/config/default_config/redis.yaml

@@ -1,10 +1,12 @@
-# redis地址
+# Redis 命令路径
+path: redis-server
+# Redis 地址
 host: 127.0.0.1
-# redis端口
+# Redis 端口
 port: 6379
-# redis用户名，可以为空
+# Redis 用户名
 username:
-# redis密码，没有密码可以为空
+# Redis 密码
 password:
-# redis数据库
+# Redis 数据库
 db: 0

Yunzai/config/pm2.yaml

@@ -2,6 +2,6 @@ apps:
   - name: TRSS-Yunzai
     script: ./app.js
     max_memory_restart: 512M
-    restart_delay: 60000
+    exp_backoff_restart_delay: 1000
     env:
       app_type: pm2

Yunzai/lib/bot.js

@@ -1,58 +1,107 @@
-import "./config/init.js"
+import init from "./config/init.js"
 import cfg from "./config/config.js"
-import redisInit from "./config/redis.js"
 import PluginsLoader from "./plugins/loader.js"
 import ListenerLoader from "./listener/loader.js"
 import { EventEmitter } from "events"
 import express from "express"
 import http from "node:http"
 import { WebSocketServer } from "ws"
-import _ from "lodash"
 import fs from "node:fs/promises"
 import path from "node:path"
 import util from "node:util"
 import fetch from "node-fetch"
-import { randomUUID } from "node:crypto"
-import { exec } from "node:child_process"
+import { exec, execFile } from "node:child_process"
 import { fileTypeFromBuffer } from "file-type"
 import md5 from "md5"
-import { Level } from "level"
+import { ulid } from "ulid"
 
 export default class Yunzai extends EventEmitter {
-  constructor() {
-    super()
-    this.stat = { start_time: Date.now()/1000 }
-    this.uin = []
-    this.adapter = []
-
-    this.express = express()
-    for (const i of ["urlencoded", "json", "raw", "text"])
-      this.express.use(express[i]({ extended: false }))
-    this.express.use(req => {
+  stat = { start_time: Date.now()/1000 }
+  bot = this
+  bots = {}
+  uin = Object.assign([], {
+    toJSON() {
+      if (!this.now) {
+        switch (this.length) {
+          case 0:
+            return ""
+          case 1:
+          case 2:
+            return this[this.length-1]
+        }
+        const array = this.slice(1)
+        this.now = array[Math.floor(Math.random()*array.length)]
+        setTimeout(() => delete this.now, 60000)
+      }
+      return this.now
+    },
+    toString(raw, ...args) {
+      return raw === true ?
+        this.__proto__.toString.apply(this, args) :
+        this.toJSON().toString(raw, ...args)
+    },
+    includes(value) {
+      return this.some(i => i == value)
+    },
+  })
+  adapter = []
+
+  express = Object.assign(express(), { quiet: [] })
+    .use(express.urlencoded({ extended: false }))
+    .use(express.json())
+    .use(express.raw())
+    .use(express.text())
+    .use("/status", req => req.res.send(process.memoryUsage()))
+    .use(req => {
+      let quiet = false
+      for (const i of req.app.quiet)
+        if (req.originalUrl.startsWith(i)) {
+          quiet = true
+          break
+        }
       req.rid = `${req.ip}:${req.socket.remotePort}`
       req.sid = `${req.protocol}://${req.hostname}:${req.socket.localPort}${req.originalUrl}`
-      this.makeLog("mark", ["HTTP", req.method, "请求", req.headers, req.query, req.body], `${req.sid} <= ${req.rid}`)
+      this.makeLog(quiet?"debug":"mark", ["HTTP", req.method, "请求", req.headers, req.query, req.body], `${req.sid} <= ${req.rid}`)
       req.next()
     })
-    this.express.use("/exit", req => {
-      if (["::1", "::ffff:127.0.0.1"].includes(req.ip) || req.hostname == "localhost")
+    .use("/exit", req => {
+      if (["::1", "::ffff:127.0.0.1"].includes(req.ip) || req.hostname === "localhost")
         process.exit(1)
     })
-    this.server = http.createServer(this.express)
-    this.server.on("error", err => {
-      if (typeof this[`server${err.code}`] == "function")
+    .use("/File", (...args) => this.fileSend(...args))
+
+  server = http.createServer(this.express)
+    .on("error", err => {
+      if (typeof this[`server${err.code}`] === "function")
         return this[`server${err.code}`](err)
       this.makeLog("error", err, "Server")
     })
+    .on("upgrade", (...args) => this.wsConnect(...args))
 
-    this.server.on("upgrade", (...args) => this.wsConnect(...args))
-    this.wss = new WebSocketServer({ noServer: true })
-    this.wsf = Object.create(null)
+  wss = new WebSocketServer({ noServer: true })
+  wsf = Object.create(null)
+  fs = Object.create(null)
+
+  constructor() {
+    super()
 
-    this.fs = Object.create(null)
-    this.express.use("/File", (...args) => this.fileSend(...args))
     for (const name of [404, "timeout"])
       this.fileToUrl(`resources/http/File/${name}.jpg`, { name, time: false, times: false })
+
+    return new Proxy(this.bots, {
+      get: (target, prop) => {
+        const value = this[prop] ?? target[prop]
+        if (value !== undefined) return value
+        for (const i of [this.uin.toString(), ...this.uin])
+          if (target[i]?.[prop] !== undefined) {
+            this.makeLog("trace", `因不存在 Bot.${prop} 而重定向到 Bot.${i}.${prop}`)
+            if (typeof target[i][prop]?.bind === "function")
+              return target[i][prop].bind(target[i])
+            return target[i][prop]
+          }
+        this.makeLog("trace", `不存在 Bot.${prop}`)
+      }
+    })
   }
 
   wsConnect(req, socket, head) {
@@ -77,7 +126,7 @@ export default class Yunzai extends EventEmitter {
     this.makeLog("error", ["监听端口", cfg.bot.port, "错误", err], "Server")
     try {
       await fetch(`http://localhost:${cfg.bot.port}/exit`)
-    } catch (err) {}
+    } catch {}
     this.server_listen_time = (this.server_listen_time || 0) + 1
     await this.sleep(this.server_listen_time * 1000)
     this.server.listen(cfg.bot.port)
@@ -90,7 +139,7 @@ export default class Yunzai extends EventEmitter {
   }
 
   async run() {
-    await redisInit()
+    await init()
     await this.serverLoad()
     await import("./plugins/stdin.js")
     await PluginsLoader.load()
@@ -101,63 +150,60 @@ export default class Yunzai extends EventEmitter {
     this.emit("online", this)
   }
 
-  sleep(time) {
+  sleep(time, promise) {
+    if (promise) return Promise.race([promise, this.sleep(time)])
     return new Promise(resolve => setTimeout(resolve, time))
   }
 
-  async fsStat(path) { try {
-    const stat = await fs.stat(path)
-    return stat
+  async fsStat(path, opts) { try {
+    return await fs.stat(path, opts)
   } catch (err) {
     this.makeLog("trace", ["获取", path, "状态错误", err])
     return false
   }}
 
-  async mkdir(dir) { try {
-    if (await this.fsStat(dir)) return true
-    if (!await this.mkdir(path.dirname(dir))) return false
-    await fs.mkdir(dir)
+  async mkdir(dir, opts) { try {
+    await fs.mkdir(dir, { recursive: true, ...opts })
     return true
   } catch (err) {
     this.makeLog("error", ["创建", dir, "错误", err])
     return false
   }}
 
-  async rmdir(dir) { try {
-    if (!await this.fsStat(dir)) return true
-    for (const i of await fs.readdir(dir))
-      await this.rm(`${dir}/${i}`)
-    await fs.rmdir(dir)
-    return true
-  } catch (err) {
-    this.makeLog("error", ["删除", dir, "错误", err])
-    return false
-  }}
-
-  async rm(file) { try {
-    const stat = await this.fsStat(file)
-    if (!stat) return true
-    if (stat.isDirectory())
-      return this.rmdir(file)
-    await fs.unlink(file)
+  async rm(file, opts) { try {
+    await fs.rm(file, { force: true, recursive: true, ...opts })
     return true
   } catch (err) {
     this.makeLog("error", ["删除", file, "错误", err])
     return false
   }}
 
-  async download(url, file) {
+  async glob(path, opts = {}) {
+    if (!opts.force && await this.fsStat(path))
+      return [path]
+    if (!fs.glob) return []
+    const array = []
+    try {
+      for await (const i of fs.glob(path, opts))
+        array.push(i)
+    } catch (err) {
+      this.makeLog("error", ["匹配", path, "错误", err])
+    }
+    return array
+  }
+
+  async download(url, file, opts) {
     let buffer
     if (!file || (await this.fsStat(file))?.isDirectory?.()) {
-      const type = await this.fileType(url)
+      const type = await this.fileType(url, opts)
       file = file ? path.join(file, type.name) : type.name
       buffer = type.buffer
     } else {
       await this.mkdir(path.dirname(file))
-      buffer = await this.Buffer(url)
+      buffer = await this.Buffer(url, opts)
     }
     await fs.writeFile(file, buffer)
-    return file
+    return { url, file, buffer }
   }
 
   makeMap(parent_map, parent_key, map) {
@@ -170,7 +216,7 @@ export default class Yunzai extends EventEmitter {
     const set = map.set.bind(map)
     Object.defineProperty(map, "set", {
       value: async (key, value) => {
-        if (JSON.stringify(map.get(key)) != JSON.stringify(value)) {
+        if (JSON.stringify(map.get(key)) !== JSON.stringify(value)) {
           set(key, value)
           await save()
         }
@@ -193,7 +239,7 @@ export default class Yunzai extends EventEmitter {
       if (value instanceof Map) {
         set(key, this.makeMap(map, key, value))
         await map.db.put(key, { map_array: Array.from(value) })
-      } else if (JSON.stringify(map.get(key)) != JSON.stringify(value)) {
+      } else if (JSON.stringify(map.get(key)) !== JSON.stringify(value)) {
         set(key, value)
         await map.db.put(key, value)
       }
@@ -219,7 +265,7 @@ export default class Yunzai extends EventEmitter {
       try {
         await map.set(i, (await this.fsStat(path)).isDirectory() ?
           await this.importMap(path, new Map) :
-          JSON.parse(await fs.readFile(path, "utf-8")))
+          JSON.parse(await fs.readFile(path, "utf8")))
       } catch (err) {
         this.makeLog("error", ["读取", path, "错误", err])
       }
@@ -230,12 +276,13 @@ export default class Yunzai extends EventEmitter {
   }
 
   async getMap(dir) {
-    const map = new Map()
-    const db = new Level(`${dir}-leveldb`, { valueEncoding: "json" })
+    const map = new Map
+    const db = new (await import("level"))
+      .Level(`${dir}-leveldb`, { valueEncoding: "json" })
     try {
       await db.open()
       for await (let [key, value] of db.iterator()) {
-        if (typeof value == "object" && value.map_array)
+        if (typeof value === "object" && value.map_array)
           value = this.makeMap(map, key, new Map(value.map_array))
         map.set(key, value)
       }
@@ -259,29 +306,72 @@ export default class Yunzai extends EventEmitter {
     return map
   }
 
-  String(data) {
+  StringOrNull(data) {
+    if (typeof data === "object" && typeof data.toString !== "function")
+      return "[object null]"
+    return String(data)
+  }
+
+  StringOrBuffer(data, base64) {
+    const string = String(data)
+    return string.includes("\ufffd") ? (base64 ? `base64://${data.toString("base64")}` : data) : string
+  }
+
+  getCircularReplacer() {
+    const _this_ = this, ancestors = []
+    return function (key, value) {
+      switch (typeof value) {
+        case "function":
+          return String(value)
+        case "object":
+          if (value === null)
+            return null
+          if (value instanceof Map || value instanceof Set)
+            return Array.from(value)
+          if (value instanceof Error)
+            return value.stack
+          if (value.type === "Buffer" && Array.isArray(value.data)) try {
+            return _this_.StringOrBuffer(Buffer.from(value), true)
+          } catch {}
+          break
+        default:
+          return value
+      }
+      while (ancestors.length > 0 && ancestors.at(-1) !== this)
+        ancestors.pop()
+      if (ancestors.includes(value))
+        return `[Circular ${_this_.StringOrNull(value)}]`
+      ancestors.push(value)
+      return value
+    }
+  }
+
+  String(data, opts) {
     switch (typeof data) {
       case "string":
         return data
+      case "function":
+        return String(data)
       case "object":
         if (data instanceof Error)
           return data.stack
         if (Buffer.isBuffer(data))
-          return String(data)
+          return this.StringOrBuffer(data, true)
     }
-    return JSON.stringify(data)
-  }
 
-  Loging(data) {
-    if (typeof data == "string") return data
-    if (!cfg.bot.log_object && typeof data == "object")
-      if (typeof data.toString == "function")
-        return String(data)
-      else
-        return "[object null]"
+    try {
+      return JSON.stringify(data, this.getCircularReplacer(), opts) || this.StringOrNull(data)
+    } catch (err) {
+      return this.StringOrNull(data)
+    }
+  }
 
-    return util.inspect(data, {
-      depth: null,
+  Loging(data, opts = cfg.bot.log_object) {
+    if (typeof data === "string") {}
+    else if (!opts)
+      data = this.StringOrNull(data)
+    else data = util.inspect(data, {
+      depth: 10,
       colors: true,
       showHidden: true,
       showProxy: true,
@@ -289,23 +379,25 @@ export default class Yunzai extends EventEmitter {
       breakLength: 100,
       maxArrayLength: 100,
       maxStringLength: 1000,
-      ...cfg.bot.log_object,
+      ...opts,
     })
+
+    const length = opts.length || cfg.bot.log_length
+    if (data.length > length)
+      data = `${data.slice(0, length)}${logger.gray(`... ${data.length-length} more characters`)}`
+    return data
   }
 
   async 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 Buffer.from(await (await fetch(data)).arrayBuffer())
-    } else if (await this.fsStat(data.replace(/^file:\/\//, ""))) {
-      if (opts.file) return data
-      return Buffer.from(await fs.readFile(data.replace(/^file:\/\//, "")))
-    }
+    if (data.startsWith("base64://"))
+      return Buffer.from(data.replace("base64://", ""), "base64")
+    else if (data.match(/^https?:\/\//))
+      return opts.http ? data : Buffer.from(await (await fetch(data, opts)).arrayBuffer())
+    else if (await this.fsStat(data.replace(/^file:\/\//, "")))
+      return opts.file ? data : Buffer.from(await fs.readFile(data.replace(/^file:\/\//, "")))
     return data
   }
 
@@ -322,14 +414,12 @@ export default class Yunzai extends EventEmitter {
       if (Buffer.isBuffer(file.buffer)) {
         file.type = await fileTypeFromBuffer(file.buffer)
         file.md5 = md5(file.buffer)
-        if (!file.name)
-          file.name = `${Date.now()}.${file.md5.slice(0,8)}.${file.type.ext}`
+        file.name ??= `${Date.now().toString(36)}.${file.md5.slice(0,8)}.${file.type.ext}`
       }
     } catch (err) {
       this.makeLog("error", ["文件类型检测错误", file, err])
     }
-    if (!file.name)
-      file.name = `${Date.now()}-${path.basename(file.url)}`
+    file.name ??= `${Date.now().toString(36)}-${path.basename(file.url)}`
     return file
   }
 
@@ -342,9 +432,9 @@ export default class Yunzai extends EventEmitter {
 
     file = await this.fileType({ file, name }, { http: true })
     if (!Buffer.isBuffer(file.buffer)) return file.buffer
-    file.name = file.name ? encodeURIComponent(file.name) : randomUUID()
+    file.name = file.name ? encodeURIComponent(file.name) : ulid()
 
-    if (typeof times == "number") file.times = times
+    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}`
@@ -352,10 +442,9 @@ export default class Yunzai extends EventEmitter {
 
   fileSend(req) {
     const url = req.url.replace(/^\//, "")
-    let file = this.fs[url]
-    if (!file) file = this.fs[404]
+    let file = this.fs[url] || this.fs[404]
 
-    if (typeof file.times == "number") {
+    if (typeof file.times === "number") {
       if (file.times > 0) file.times--
       else file = this.fs.timeout
     }
@@ -367,30 +456,44 @@ export default class Yunzai extends EventEmitter {
     req.res.send(file.buffer)
   }
 
-  async exec(cmd) {
-    return new Promise(resolve => {
-      this.makeLog("mark", `[执行命令] ${logger.blue(cmd)}`)
-      exec(cmd, (error, stdout, stderr) => {
-        resolve({ error, stdout, stderr })
-        this.makeLog("mark", `[执行命令完成] ${logger.blue(cmd)}${stdout?`\n${String(stdout).trim()}`:""}${stderr?logger.red(`\n${String(stderr).trim()}`):""}`)
-        if (error) this.makeLog("error", `[执行命令错误] ${logger.blue(cmd)}\n${logger.red(this.Loging(error).trim())}`)
-      })
-    })
+  async exec(cmd, opts = {}) { return new Promise(resolve => {
+    const name = logger.cyan(this.String(cmd))
+    this.makeLog(opts.quiet?"debug":"mark", name, "执行命令")
+    opts.encoding ??= "buffer"
+    const callback = (error, stdout, stderr) => {
+      const raw = { stdout, stderr }
+      stdout = String(stdout).trim()
+      stderr = String(stderr).trim()
+      resolve({ error, stdout, stderr, raw })
+      this.makeLog(opts.quiet?"debug":"mark", `${name} ${logger.green(`[完成${this.getTimeDiff(start_time)}]`)} ${stdout?`\n${stdout}`:""}${stderr?logger.red(`\n${stderr}`):""}`, "执行命令")
+      if (error) this.makeLog(opts.quiet?"debug":"error", error, "执行命令")
+    }
+    const start_time = Date.now()
+    if (Array.isArray(cmd))
+      execFile(cmd.shift(), cmd, opts, callback)
+    else
+      exec(cmd, opts, callback)
+  })}
+
+  async cmdPath(cmd, opts = {}) {
+    const ret = await this.exec(`${process.platform === "win32" ? "where" : "command -v"} "${cmd}"`, { quiet: true, ...opts })
+    return ret.error ? false : ret.stdout
   }
 
   makeLog(level, msg, id) {
     const log = []
-    if (id) log.push(logger.blue(`[${id}]`))
+    if (id !== false)
+      log.push(logger.blue(`[${id || "TRSSYz"}]`))
     for (const i of Array.isArray(msg) ? msg : [msg])
-      log.push(_.truncate(this.Loging(i), { length: cfg.bot.log_length }))
-    logger[level](...log)
+      log.push(this.Loging(i))
+    logger.logger[level](...log)
   }
 
-  makeEvent(data) {
-    if (!this[data.self_id]) return
+  prepareEvent(data) {
+    if (!this.bots[data.self_id]) return
     if (!data.bot)
       Object.defineProperty(data, "bot", {
-        value: this[data.self_id],
+        value: this.bots[data.self_id],
       })
     if (!data.friend && data.user_id)
       Object.defineProperty(data, "friend", {
@@ -411,24 +514,20 @@ export default class Yunzai extends EventEmitter {
       data.adapter_name = data.bot.adapter.name
 
     for (const i of [data.friend, data.group, data.member]) {
-      if (typeof i != "object") continue
-      if (!i.sendFile)
-        i.sendFile = (file, name) => i.sendMsg(segment.file(file, name))
-      if (!i.makeForwardMsg)
-        i.makeForwardMsg = this.makeForwardMsg
-      if (!i.sendForwardMsg)
-        i.sendForwardMsg = msg => this.sendForwardMsg(msg => i.sendMsg(msg), msg)
-      if (!i.getInfo)
-        i.getInfo = () => i
+      if (typeof i !== "object") continue
+      i.sendFile ??= (file, name) => i.sendMsg(segment.file(file, name))
+      i.makeForwardMsg ??= this.makeForwardMsg
+      i.sendForwardMsg ??= msg => this.sendForwardMsg(msg => i.sendMsg(msg), msg)
+      i.getInfo ??= () => i.info || i
     }
   }
 
   em(name = "", data = {}) {
-    this.makeEvent(data)
+    this.prepareEvent(data)
     while (true) {
       this.emit(name, data)
       const i = name.lastIndexOf(".")
-      if (i == -1) break
+      if (i === -1) break
       name = name.slice(0, i)
     }
   }
@@ -436,7 +535,7 @@ export default class Yunzai extends EventEmitter {
   getFriendArray() {
     const array = []
     for (const bot_id of this.uin)
-      for (const [id, i] of this[bot_id].fl || [])
+      for (const [id, i] of this.bots[bot_id].fl || [])
         array.push({ ...i, bot_id })
     return array
   }
@@ -444,15 +543,14 @@ export default class Yunzai extends EventEmitter {
   getFriendList() {
     const array = []
     for (const bot_id of this.uin)
-      for (const [id, i] of this[bot_id].fl || [])
-        array.push(id)
+      array.push(...(this.bots[bot_id].fl?.keys() || []))
     return array
   }
 
   getFriendMap() {
     const map = new Map
     for (const bot_id of this.uin)
-      for (const [id, i] of this[bot_id].fl || [])
+      for (const [id, i] of this.bots[bot_id].fl || [])
         map.set(id, { ...i, bot_id })
     return map
   }
@@ -461,7 +559,7 @@ export default class Yunzai extends EventEmitter {
   getGroupArray() {
     const array = []
     for (const bot_id of this.uin)
-      for (const [id, i] of this[bot_id].gl || [])
+      for (const [id, i] of this.bots[bot_id].gl || [])
         array.push({ ...i, bot_id })
     return array
   }
@@ -469,15 +567,14 @@ export default class Yunzai extends EventEmitter {
   getGroupList() {
     const array = []
     for (const bot_id of this.uin)
-      for (const [id, i] of this[bot_id].gl || [])
-        array.push(id)
+      array.push(...(this.bots[bot_id].gl?.keys() || []))
     return array
   }
 
   getGroupMap() {
     const map = new Map
     for (const bot_id of this.uin)
-      for (const [id, i] of this[bot_id].gl || [])
+      for (const [id, i] of this.bots[bot_id].gl || [])
         map.set(id, { ...i, bot_id })
     return map
   }
@@ -485,100 +582,130 @@ export default class Yunzai extends EventEmitter {
   get gml() {
     const map = new Map
     for (const bot_id of this.uin)
-      for (const [id, i] of this[bot_id].gml || [])
-        map.set(id, i)
+      for (const [id, i] of this.bots[bot_id].gml || [])
+        map.set(id, Object.assign(new Map(i), { bot_id }))
     return map
   }
 
-  pickFriend(user_id) {
-    user_id = Number(user_id) || String(user_id)
-    const user = this.fl.get(user_id)
-    if (user) return this[user.bot_id].pickFriend(user_id)
-    this.makeLog("error", ["获取用户对象错误：找不到用户", user_id])
+  pickFriend(user_id, strict) {
+    user_id = Number(user_id) || user_id
+    let user = this.fl.get(user_id)
+    if (!user) for (const [id, ml] of this.gml) {
+      user = ml.get(user_id)
+      if (user) {
+        user.bot_id = ml.bot_id
+        break
+      }
+    }
+    if (user) return this.bots[user.bot_id].pickFriend(user_id)
+    if (strict) return false
+    this.makeLog("debug", ["因不存在用户", user_id, "而随机选择Bot", this.uin.toJSON()])
+    return this.bots[this.uin].pickFriend(user_id)
   }
   get pickUser() { return this.pickFriend }
 
-  pickGroup(group_id) {
-    group_id = Number(group_id) || String(group_id)
+  pickGroup(group_id, strict) {
+    group_id = Number(group_id) || group_id
     const group = this.gl.get(group_id)
-    if (group) return this[group.bot_id].pickGroup(group_id)
-    this.makeLog("error", ["获取群对象错误：找不到群", group_id])
+    if (group) return this.bots[group.bot_id].pickGroup(group_id)
+    if (strict) return false
+    this.makeLog("debug", ["因不存在群", group_id, "而随机选择Bot", this.uin.toJSON()])
+    return this.bots[this.uin].pickGroup(group_id)
   }
 
   pickMember(group_id, user_id) {
-    const group = this.pickGroup(group_id)
-    if (group) return group.pickMember(user_id)
+    return this.pickGroup(group_id).pickMember(user_id)
   }
 
-  sendFriendMsg(bot_id, user_id, msg) {
-    try {
-      if (!bot_id)
-        return this.pickFriend(user_id).sendMsg(msg)
+  sendFriendMsg(bot_id, user_id, ...args) { try {
+    if (!bot_id)
+      return this.pickFriend(user_id).sendMsg(...args)
 
-      if (this[bot_id])
-        return this[bot_id].pickFriend(user_id).sendMsg(msg)
+    if (this.uin.includes(bot_id) && this.bots[bot_id])
+      return this.bots[bot_id].pickFriend(user_id).sendMsg(...args)
 
-      return new Promise(resolve =>
-        this.once(`connect.${bot_id}`, data =>
-          resolve(data.bot.pickFriend(user_id).sendMsg(msg))))
-    } catch (err) {
-      this.makeLog("error", [`发送好友消息错误：[${user_id}]`, err], bot_id)
-    }
-    return false
-  }
+    if (this.pickFriend(bot_id, true))
+      return this.pickFriend(bot_id).sendMsg(user_id, ...args)
 
-  sendGroupMsg(bot_id, group_id, msg) {
-    try {
-      if (!bot_id)
-        return this.pickGroup(group_id).sendMsg(msg)
+    return new Promise((resolve, reject) => {
+      const listener = data => {
+        resolve(data.bot.pickFriend(user_id).sendMsg(...args))
+        clearTimeout(timeout)
+      }
+      const timeout = setTimeout(() => {
+        reject(Object.assign(Error("等待 Bot 上线超时"), { bot_id, user_id, args }))
+        this.off(`connect.${bot_id}`, listener)
+      }, 300000)
+      this.once(`connect.${bot_id}`, listener)
+    })
+  } catch (err) {
+    this.makeLog("error", ["发送好友消息错误", args, err], `${bot_id} => ${user_id}`)
+  }}
 
-      if (this[bot_id])
-        return this[bot_id].pickGroup(group_id).sendMsg(msg)
+  sendGroupMsg(bot_id, group_id, ...args) { try {
+    if (!bot_id)
+      return this.pickGroup(group_id).sendMsg(...args)
 
-      return new Promise(resolve =>
-        this.once(`connect.${bot_id}`, data =>
-          resolve(data.bot.pickGroup(group_id).sendMsg(msg))))
-    } catch (err) {
-      this.makeLog("error", [`发送群消息错误：[${group_id}]`, err], bot_id)
-    }
-    return false
-  }
+    if (this.uin.includes(bot_id) && this.bots[bot_id])
+      return this.bots[bot_id].pickGroup(group_id).sendMsg(...args)
+
+    if (this.pickGroup(bot_id, true))
+      return this.pickGroup(bot_id).sendMsg(group_id, ...args)
+
+    return new Promise((resolve, reject) => {
+      const listener = data => {
+        resolve(data.bot.pickGroup(group_id).sendMsg(...args))
+        clearTimeout(timeout)
+      }
+      const timeout = setTimeout(() => {
+        reject(Object.assign(Error("等待 Bot 上线超时"), { bot_id, group_id, args }))
+        this.off(`connect.${bot_id}`, listener)
+      }, 300000)
+      this.once(`connect.${bot_id}`, listener)
+    })
+  } catch (err) {
+    this.makeLog("error", ["发送群消息错误", args, err], `${bot_id} => ${group_id}`)
+  }}
 
-  async getTextMsg(fnc = () => true) {
-    if (typeof fnc != "function") {
+  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
     }
 
-    while (true) { try {
-      const msg = await new Promise(resolve => {
-        this.once("message", data => {
-          if (data.message && fnc(data)) {
-            let msg = ""
-            for (const i of data.message)
-              if (i.type == "text" && i.text)
-                msg += i.text.trim()
-            resolve(msg)
-          } else {
-            resolve(false)
-          }
-        })
-      })
-      if (msg) return msg
-    } catch (err) {
-      this.makeLog("error", err)
-    }}
+    return new Promise(resolve => {
+      const listener = data => { try {
+        if (!fnc(data)) return
+
+        let msg = ""
+        for (const i of data.message)
+          if (i.type === "text" && i.text)
+            msg += i.text.trim()
+        if (!msg) return
+
+        resolve(msg)
+        this.off("message", listener)
+      } catch (err) {
+        this.makeLog("error", err, data.self_id)
+      }}
+      this.on("message", listener)
+    })
   }
 
   getMasterMsg() {
-    return this.getTextMsg(data =>
-      cfg.master[data.self_id]?.includes(String(data.user_id)))
+    return this.getTextMsg(data => cfg.master[data.self_id]?.includes(String(data.user_id)))
   }
 
-  sendMasterMsg(msg) {
-    for (const bot_id in cfg.master)
-      for (const user_id of cfg.master[bot_id])
-        this.sendFriendMsg(bot_id, user_id, msg)
+  async sendMasterMsg(msg, bot_array = Object.keys(cfg.master), sleep = 5000) {
+    const ret = {}
+    await Promise.allSettled((Array.isArray(bot_array) ? bot_array : [bot_array]).map(async bot_id => {
+      ret[bot_id] = {}
+      for (const user_id of cfg.master[bot_id] || []) {
+        ret[bot_id][user_id] = this.sendFriendMsg(bot_id, user_id, msg)
+        if (sleep) await this.sleep(sleep, ret[bot_id][user_id])
+      }
+    }))
+    return ret
   }
 
   makeForwardMsg(msg) { return { type: "node", data: msg } }
@@ -597,16 +724,16 @@ export default class Yunzai extends EventEmitter {
     return messages
   }
 
-  getTimeDiff(time1 = this.stat.start_time, time2 = Date.now()/1000) {
-    const time = time2 - time1
+  getTimeDiff(time1 = this.stat.start_time*1000, time2 = Date.now()) {
+    const time = (time2-time1)/1000
     let ret = ""
-    const day = Math.floor(time / 3600 / 24)
+    const day = Math.floor(time/3600/24)
     if (day) ret += `${day}天`
-    const hour = Math.floor((time / 3600) % 24)
+    const hour = Math.floor((time/3600)%24)
     if (hour) ret += `${hour}时`
-    const min = Math.floor((time / 60) % 60)
+    const min = Math.floor((time/60)%60)
     if (min) ret += `${min}分`
-    const sec = Math.floor(time % 60)
+    const sec = (time%60).toFixed(3)
     if (sec) ret += `${sec}秒`
     return ret || "0秒"
   }

Yunzai/lib/common/common.js

@@ -1,16 +1,13 @@
-import { pipeline } from 'stream'
-import { promisify } from 'util'
-import fetch from 'node-fetch'
-import fs from 'node:fs'
-import path from 'node:path'
+import fs from "node:fs"
 
 /**
  * 发送私聊消息
  * @param user_id 账号
  * @param msg 消息
+ * @param bot_id 机器人账号
  */
-function relpyPrivate(userId, msg) {
-  return Bot.pickFriend(userId).sendMsg(msg)
+function relpyPrivate(user_id, msg, bot_id) {
+  return Bot.sendFriendMsg(bot_id, user_id, msg)
 }
 
 /**
@@ -18,22 +15,18 @@ function relpyPrivate(userId, msg) {
  * @param ms 毫秒
  */
 function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms))
+  return new Promise(resolve => setTimeout(resolve, ms))
 }
 
 /**
  * 下载保存文件
- * @param fileUrl 下载地址
- * @param savePath 保存路径
+ * @param url 下载地址
+ * @param file 保存路径
+ * @param opts 下载参数
  */
-async function downFile(fileUrl, savePath,param = {}) {
+async function downFile(url, file, opts) {
   try {
-    mkdirs(path.dirname(savePath))
-    logger.debug(`[下载文件] ${fileUrl}`)
-    const response = await fetch(fileUrl,param)
-    const streamPipeline = promisify(pipeline)
-    await streamPipeline(response.body, fs.createWriteStream(savePath))
-    return true
+    return await Bot.download(url, file, opts)
   } catch (err) {
     logger.error(`下载文件错误：${err}`)
     return false
@@ -42,10 +35,8 @@ async function downFile(fileUrl, savePath,param = {}) {
 
 function mkdirs(dirname) {
   if (fs.existsSync(dirname)) return true
-  if (mkdirs(path.dirname(dirname))) {
-    fs.mkdirSync(dirname)
-    return true
-  }
+  fs.mkdirSync(dirname, { recursive: true })
+  return true
 }
 
 /**

Yunzai/lib/config/config.js

@@ -6,11 +6,12 @@ import chokidar from "chokidar"
 class Cfg {
   constructor() {
     this.config = {}
-
     /** 监听文件 */
     this.watcher = { config: {}, defSet: {} }
-
     this.initCfg()
+    return new Proxy(this, {
+      get: (target, prop) => target[prop] ?? target.getAllCfg(String(prop)),
+    })
   }
 
   /** 初始化配置 */
@@ -26,43 +27,22 @@ class Cfg {
         fs.mkdirSync(i)
   }
 
-  /** Bot配置 */
-  get bot() {
-    let bot = this.getConfig("bot")
-    let defbot = this.getdefSet("bot")
-    bot = { ...defbot, ...bot }
-
-    return bot
-  }
-
-  get other() {
-    return this.getConfig("other")
-  }
-
-  get redis() {
-    return this.getConfig("redis")
-  }
-
-  get renderer() {
-    return this.getConfig("renderer");
-  }
-
   /** 主人账号 */
   get masterQQ() {
-    let masterQQ = this.getConfig("other").masterQQ || []
+    let masterQQ = this.getAllCfg("other").masterQQ || []
 
     if (!Array.isArray(masterQQ))
       masterQQ = [masterQQ]
 
     const masters = []
     for (const i of masterQQ)
-      masters.push(Number(i) || String(i))
+      masters.push(Number(i) || i)
     return masters
   }
 
   /** Bot账号:[主人帐号] */
   get master() {
-    let master = this.getConfig("other").master || []
+    let master = this.getAllCfg("other").master || []
 
     if (!Array.isArray(master))
       master = [master]
@@ -98,10 +78,8 @@ class Cfg {
 
   /** 群配置 */
   getGroup(bot_id = "", group_id = "") {
-    const config = this.getConfig("group")
-    const defCfg = this.getdefSet("group")
+    const config = this.getAllCfg("group")
     return {
-      ...defCfg.default,
       ...config.default,
       ...config[`${bot_id}:default`],
       ...config[group_id],
@@ -111,9 +89,7 @@ class Cfg {
 
   /** other配置 */
   getOther() {
-    let def = this.getdefSet("other")
-    let config = this.getConfig("other")
-    return { ...def, ...config }
+    return this.getAllCfg("other")
   }
 
   /**
@@ -129,39 +105,47 @@ class Cfg {
     return this.getYaml("config", name)
   }
 
+  getAllCfg(name) {
+    return {
+      ...this.getdefSet(name),
+      ...this.getConfig(name),
+    }
+  }
+
   /**
    * 获取配置yaml
    * @param type 默认跑配置-defSet，用户配置-config
    * @param name 名称
    */
   getYaml(type, name) {
-    let file = `config/${type}/${name}.yaml`
-    let key = `${type}.${name}`
-    if (this.config[key]) return this.config[key]
-
-    this.config[key] = YAML.parse(
-      fs.readFileSync(file, "utf8")
-    )
+    const key = `${type}.${name}`
+    if (key in this.config) return this.config[key]
+    const file = `config/${type}/${name}.yaml`
+
+    try {
+      this.config[key] = fs.readFileSync(file, "utf8")
+    } catch (err) {
+      Bot.makeLog("trace", ["读取配置文件", file, "错误", err], "Config")
+      return this.config[key] = undefined
+    }
 
+    this.config[key] = YAML.parse(this.config[key])
     this.watch(file, name, type)
-
     return this.config[key]
   }
 
   /** 监听配置文件 */
   watch(file, name, type = "default_config") {
-    let key = `${type}.${name}`
+    const key = `${type}.${name}`
 
     if (this.watcher[key]) return
-
     const watcher = chokidar.watch(file)
     watcher.on("change", path => {
       delete this.config[key]
-      if (typeof Bot == "undefined") return
-      logger.mark(`[修改配置文件][${type}][${name}]`)
-      if (this[`change_${name}`]) {
+      if (typeof Bot !== "object") return
+      Bot.makeLog("mark", `[修改配置文件][${type}][${name}]`, "Config")
+      if (`change_${name}` in this)
         this[`change_${name}`]()
-      }
     })
 
     this.watcher[key] = watcher
@@ -169,8 +153,7 @@ class Cfg {
 
   async change_bot() {
     /** 修改日志等级 */
-    let log = await import("./log.js")
-    log.default()
+    (await import("./log.js")).default()
   }
 }
 

Yunzai/lib/config/init.js

@@ -1,5 +1,6 @@
 import setLog from "./log.js"
 import cfg from "./config.js"
+import redisInit from "./redis.js"
 
 /** 设置标题 */
 process.title = `TRSS Yunzai v${cfg.package.version} © 2023 - 2024 TimeRainStarSky`
@@ -7,7 +8,8 @@ process.title = `TRSS Yunzai v${cfg.package.version} © 2023 - 2024 TimeRainStar
 /** 设置时区 */
 process.env.TZ = "Asia/Shanghai"
 
-process.on("SIGHUP", () => process.exit())
+for (const i of ["SIGHUP", "SIGTERM"])
+  process.on(i, (signal, code) => process.exit(code))
 
 /** 日志设置 */
 setLog()
@@ -23,14 +25,29 @@ for (const i of ["uncaughtException", "unhandledRejection"])
     }
   })
 
-/** 退出事件 */
-process.on("exit", code => {
-  if (typeof redis != "undefined")
-    redis.save()
-
-  logger.mark(logger.magenta(`TRSS-Yunzai 已停止运行，本次运行时长：${Bot.getTimeDiff()} (${code})`))
-})
-
 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"))
+
+let stack
+export default async function init() {
+  if (stack !== undefined) return
+  stack = ""
+
+  const redis = await redisInit()
+  const exit = process.exit
+  process.exit = async code => {
+    stack = Error().stack
+    if (redis.process) {
+      await Bot.sleep(5000, redis.save())
+      redis.process.kill()
+    }
+    exit(code)
+  }
+
+  /** 退出事件 */
+  process.on("exit", code => {
+    Bot.makeLog("mark", logger.magenta(`TRSS-Yunzai 已停止运行，本次运行时长：${Bot.getTimeDiff()} (${code})`), "exit")
+    Bot.makeLog("trace", (stack || Error().stack), "exit")
+  })
+}

Yunzai/lib/config/log.js

@@ -1,5 +1,5 @@
 import log4js from "log4js"
-import chalk from "chalk"
+import { Chalk } from "chalk"
 import cfg from "./config.js"
 import fs from "node:fs"
 
@@ -7,9 +7,8 @@ import fs from "node:fs"
 * 设置日志样式
 */
 export default function setLog() {
-  let file = "./logs"
-  if (!fs.existsSync(file))
-    fs.mkdirSync(file)
+  if (!fs.existsSync("logs"))
+    fs.mkdirSync("logs")
 
   /** 调整error日志等级 */
   // log4js.levels.levels[5].level = Number.MAX_VALUE
@@ -21,7 +20,7 @@ export default function setLog() {
         type: "console",
         layout: {
           type: "pattern",
-          pattern: "%[[TRSSYz][%d{hh:mm:ss.SSS}][%4.4p]%] %m"
+          pattern: "%[[%d{hh:mm:ss.SSS}][%4.4p]%]%m"
         }
       },
       command: {
@@ -32,7 +31,7 @@ export default function setLog() {
         alwaysIncludePattern: true,
         layout: {
           type: "pattern",
-          pattern: "[%d{hh:mm:ss.SSS}][%4.4p] %m"
+          pattern: "[%d{hh:mm:ss.SSS}][%4.4p]%m"
         }
       },
       error: {
@@ -41,7 +40,7 @@ export default function setLog() {
         alwaysIncludePattern: true,
         layout: {
           type: "pattern",
-          pattern: "[%d{hh:mm:ss.SSS}][%4.4p] %m"
+          pattern: "[%d{hh:mm:ss.SSS}][%4.4p]%m"
         }
       }
     },
@@ -52,25 +51,23 @@ export default function setLog() {
     }
   })
 
-  const defaultLogger = log4js.getLogger("message")
-  const commandLogger = log4js.getLogger("command")
-  const errorLogger = log4js.getLogger("error")
-
   /** 全局变量 logger */
-  global.logger = {
-    trace: (...args) => defaultLogger.trace(...args),
-    debug: (...args) => defaultLogger.debug(...args),
-    info: (...args) => defaultLogger.info(...args),
-    warn: (...args) => commandLogger.warn(...args),
-    error: (...args) => errorLogger.error(...args),
-    fatal: (...args) => errorLogger.fatal(...args),
-    mark: (...args) => commandLogger.mark(...args),
-    chalk: chalk,
-    red: chalk.red,
-    green: chalk.green,
-    yellow: chalk.yellow,
-    blue: chalk.blue,
-    magenta: chalk.magenta,
-    cyan: chalk.cyan,
+  const chalk = new Chalk({ level: 3 })
+  chalk.logger = {
+    defaultLogger: log4js.getLogger("message"),
+    commandLogger: log4js.getLogger("command"),
+    errorLogger: log4js.getLogger("error"),
+    trace(...args) { return this.defaultLogger.trace(...args) },
+    debug(...args) { return this.defaultLogger.debug(...args) },
+    info(...args) { return this.defaultLogger.info(...args) },
+    warn(...args) { return this.commandLogger.warn(...args) },
+    error(...args) { return this.errorLogger.error(...args) },
+    fatal(...args) { return this.errorLogger.fatal(...args) },
+    mark(...args) { return this.commandLogger.mark(...args) },
   }
+  const defid = chalk.blue(`[TRSSYz]`)
+  for (const i in chalk.logger)
+    if (typeof chalk.logger[i] == "function")
+      chalk[i] = (...args) => chalk.logger[i](defid, ...args)
+  global.logger = chalk
 }

Yunzai/lib/config/redis.js

@@ -1,66 +1,109 @@
 import cfg from "./config.js"
 import { createClient } from "redis"
-import { exec } from "node:child_process"
+import { spawn } from "node:child_process"
 
-let lock = false
 /**
  * 初始化全局redis客户端
  */
 export default async function redisInit() {
   const rc = cfg.redis
-  const redisUn = rc.username || ""
-  let redisPw = rc.password ? `:${rc.password}` : ""
-  if (rc.username || rc.password)
-    redisPw += "@"
-  const redisUrl = `redis://${redisUn}${redisPw}${rc.host}:${rc.port}/${rc.db}`
-  Bot.makeLog("info", `正在连接 ${logger.blue(redisUrl)}`, "Redis")
-  return connectRedis(redisUrl)
+  return global.redis = await new Redis({
+    socket: {
+      host: rc.host,
+      port: rc.port,
+    },
+    username: rc.username,
+    password: rc.password,
+    database: rc.db,
+  }, true).connect()
 }
 
-async function connectRedis(redisUrl, cmd) {
-  if (lock && !cmd) return
-  lock = true
+export class Redis {
+  constructor(opts, exit) {
+    Bot.makeLog("info", `正在连接 ${logger.cyan(`redis://${opts.socket.host}:${opts.socket.port}/${opts.database}`)}`, "Redis")
+    this.opts = opts
+    this.redis = createClient(opts)
+    this.redis.class = this
+    this.exit = exit
+  }
+
+  async connect(force) {
+    if (this.lock && !force) return
+    this.lock = true
+
+    try {
+      await this.redis.connect()
+    } catch (err) {
+      await this.redis.disconnect()
+        .catch(err => Bot.makeLog("error", err, "Redis"))
+      this.err = err
+      if (!force) return this.start()
+      return false
+    }
 
-  try {
-    global.redis = createClient({ url: redisUrl })
-    await redis.connect()
-  } catch (err) {
-    Bot.makeLog("error", ["连接错误", err], "Redis")
-    if (!cmd) return startRedis(redisUrl)
-    Bot.makeLog("error", ["请先启动", logger.blue(cmd)], "Redis")
-    process.exit(1)
+    this.lock = false
+    return this.redis.once("error", this.onerror)
   }
 
-  redis.on("error", err => {
-    Bot.makeLog("error", err, "Redis")
-    return connectRedis(redisUrl)
-  })
+  async start() {
+    if (this.opts.socket.host !== "127.0.0.1") {
+      Bot.makeLog("error", [`连接错误，请确认连接地址正确`, this.err], "Redis")
+      if (this.exit) process.exit(1)
+      return false
+    }
 
-  lock = false
-  return redis
-}
+    const cmd = [
+      cfg.redis.path,
+      "--port", this.opts.socket.port,
+      ...await this.aarch64(),
+    ]
+    Bot.makeLog("info", ["正在启动", logger.cyan(cmd.join(" "))], "Redis")
+    const redisProcess = spawn(cmd[0], cmd.slice(1))
+      .on("error", err => {
+        Bot.makeLog("error", ["启动错误", err], "Redis")
+        redisProcess.exit = true
+      })
+      .on("exit", () => redisProcess.exit = true)
+    redisProcess.stdout.on("data", data => {
+      Bot.makeLog("info", Bot.String(data).trim(), "Redis")
+    })
+    redisProcess.stderr.on("data", data => {
+      Bot.makeLog("error", Bot.String(data).trim(), "Redis")
+    })
+    this.redis.process = redisProcess
 
-async function startRedis(redisUrl) {
-  if (cfg.redis.host != "127.0.0.1") {
-    Bot.makeLog("error", `连接失败，请确认连接地址正确`, "Redis")
-    process.exit(1)
+    for (let i=0; i<15; i++) {
+      await Bot.sleep(1000)
+      if (redisProcess.exit) break
+      const ret = await this.connect(true)
+      if (ret) return ret
+    }
+
+    Bot.makeLog("error", ["连接错误", this.err], "Redis")
+    redisProcess.kill()
+    if (this.exit) process.exit(1)
+    return false
+  }
+
+  onerror = async (err) => {
+    Bot.makeLog("error", err, "Redis")
+    await this.redis.disconnect()
+      .catch(err => Bot.makeLog("error", err, "Redis"))
+    if (this.redis.process) this.redis.process.kill()
+    return this.connect()
   }
-  const cmd = `redis-server --port ${cfg.redis.port} --save 900 1 --save 300 10 --daemonize yes${await aarch64()}`
-  await Bot.exec(cmd)
-  await Bot.sleep(1000)
-  return connectRedis(redisUrl, cmd)
-}
 
-async function aarch64() {
-  if (process.platform == "win32" || process.arch != "arm64")
-    return ""
-  /** 判断redis版本 */
-  let v = await Bot.exec("redis-server -v")
-  if (v.stdout?.match) {
-    v = v.stdout.match(/v=(\d)./)
-    /** 忽略arm警告 */
-    if (v && v[1] >= 6)
-      return " --ignore-warnings ARM64-COW-BUG"
+  async aarch64() {
+    if (process.platform === "win32" || process.arch !== "arm64")
+      return []
+    /** 判断redis版本 */
+    let v = await Bot.exec("redis-server -v")
+    if (v.stdout?.match) {
+      v = v.stdout.match(/v=(\d)./)
+      /** 忽略arm警告 */
+      if (v && v[1] >= 6)
+        return ["--ignore-warnings", "ARM64-COW-BUG"]
+    }
+    return []
   }
-  return ""
 }

Yunzai/lib/listener/listener.js

@@ -7,7 +7,7 @@ export default class EventListener {
    * @param data.event 监听的事件
    * @param data.once 是否只监听一次
    */
-  constructor (data) {
+  constructor(data) {
     this.prefix = data.prefix || ""
     this.event = data.event
     this.once = data.once || false

Yunzai/lib/listener/loader.js

@@ -8,12 +8,12 @@ class ListenerLoader {
   /**
    * 监听事件加载
    */
-  async load () {
-    logger.info("-----------")
-    logger.info("加载监听事件中...")
+  async load() {
+    Bot.makeLog("info", "-----------", "Listener")
+    Bot.makeLog("info", "加载监听事件中...", "Listener")
     let eventCount = 0
     for (const file of (await fs.readdir("./lib/events")).filter(file => file.endsWith(".js"))) {
-      logger.debug(`加载监听事件：${file}`)
+      Bot.makeLog("debug", [`加载监听事件 ${file}`], "Listener")
       try {
         let listener = await import(`../events/${file}`)
         if (!listener.default) continue
@@ -30,27 +30,25 @@ class ListenerLoader {
           Bot[on](listener.prefix + listener.event, event => listener[e](event))
         }
         eventCount++
-      } catch (e) {
-        logger.mark(`监听事件错误：${file}`)
-        logger.error(e)
+      } catch (err) {
+        Bot.makeLog("error", [`监听事件加载错误 ${file}`, err], "Listener")
       }
     }
-    logger.info(`加载监听事件[${eventCount}个]`)
+    Bot.makeLog("info", `加载监听事件[${eventCount}个]`, "Listener")
 
-    logger.info("-----------")
-    logger.info("加载适配器中...")
+    Bot.makeLog("info", "-----------", "Adapter")
+    Bot.makeLog("info", "加载适配器中...", "Adapter")
     let adapterCount = 0
     for (const adapter of Bot.adapter) {
       try {
-        logger.debug(`加载适配器：${adapter.name}(${adapter.id})`)
+        Bot.makeLog("debug", [`加载适配器 ${adapter.name}(${adapter.id})`], "Adapter")
         await adapter.load()
         adapterCount++
-      } catch (e) {
-        logger.mark(`加载适配器错误：${adapter.name}(${adapter.id})`)
-        logger.error(e)
+      } catch (err) {
+        Bot.makeLog("error", [`适配器加载错误 ${adapter.name}(${adapter.id})`, err], "Adapter")
       }
     }
-    logger.info(`加载适配器[${adapterCount}个]`)
+    Bot.makeLog("info", `加载适配器[${adapterCount}个]`, "Adapter")
   }
 }
 

Yunzai/lib/modules/oicq/index.js

@@ -1,34 +1,41 @@
-const segment = new class segment {
+const segment = {
   custom(type, data) {
     return { type, ...data }
-  }
+  },
   raw(data) {
     return { type: "raw", data }
-  }
+  },
   button(...data) {
     return { type: "button", data }
-  }
+  },
   markdown(data) {
     return { type: "markdown", data }
-  }
+  },
   image(file, name) {
     return { type: "image", file, name }
-  }
+  },
   at(qq, name) {
     return { type: "at", qq, name }
-  }
+  },
   record(file, name) {
     return { type: "record", file, name }
-  }
+  },
   video(file, name) {
     return { type: "video", file, name }
-  }
+  },
   file(file, name) {
     return { type: "file", file, name }
-  }
+  },
   reply(id, text, qq, time, seq) {
     return { type: "reply", id, text, qq, time, seq }
-  }
+  },
 }
 
+try {
+  const { segment: icqq_segment } = await import(`file://${process.cwd()}/plugins/ICQQ-Plugin/node_modules/icqq/lib/message/elements.js`)
+  const { deprecate } = await import("node:util")
+  for (const i in icqq_segment) if (!segment[i])
+    segment[i] = deprecate(icqq_segment[i], `segment.${i} 仅在 icqq 上可用`)
+} catch {}
+
 export { segment }

Yunzai/lib/plugins/config.js

@@ -3,11 +3,11 @@ import YAML from "yaml"
 import _ from "lodash"
 export default async function(name, config, keep) {
   const configFile = `config/${name}.yaml`
-  const configSave = () => fs.writeFile(configFile, YAML.stringify(config), "utf-8")
+  const configSave = () => fs.writeFile(configFile, YAML.stringify(config), "utf8")
 
   let configData
   try {
-    configData = YAML.parse(await fs.readFile(configFile, "utf-8"))
+    configData = YAML.parse(await fs.readFile(configFile, "utf8"))
     _.merge(config, configData)
   } catch (err) {
     logger.debug("配置文件", configFile, "读取失败", err)

Yunzai/lib/plugins/loader.js

@@ -19,29 +19,27 @@ global.segment = segment
  * 加载插件
  */
 class PluginsLoader {
-  constructor() {
-    this.priority = []
-    this.handler = {}
-    this.task = []
-    this.dir = "plugins"
-
-    /** 命令冷却cd */
-    this.groupCD = {}
-    this.singleCD = {}
-
-    /** 插件监听 */
-    this.watcher = {}
-    this.eventMap = {
-      message: ["post_type", "message_type", "sub_type"],
-      notice: ["post_type", "notice_type", "sub_type"],
-      request: ["post_type", "request_type", "sub_type"],
-    }
+  priority = []
+  handler = {}
+  task = []
+  dir = "plugins"
+
+  /** 命令冷却cd */
+  groupCD = {}
+  singleCD = {}
+
+  /** 插件监听 */
+  watcher = {}
+  eventMap = {
+    message: ["post_type", "message_type", "sub_type"],
+    notice: ["post_type", "notice_type", "sub_type"],
+    request: ["post_type", "request_type", "sub_type"],
+  }
 
-    this.msgThrottle = {}
+  msgThrottle = {}
 
-    /** 星铁命令前缀 */
-    this.srReg = /^#?(\*|星铁|星轨|穹轨|星穹|崩铁|星穹铁道|崩坏星穹铁道|铁道)+/
-  }
+  /** 星铁命令前缀 */
+  srReg = /^#?(\*|星铁|星轨|穹轨|星穹|崩铁|星穹铁道|崩坏星穹铁道|铁道)+/
 
   async getPlugins() {
     const files = await fs.readdir(this.dir, { withFileTypes: true })
@@ -82,8 +80,8 @@ class PluginsLoader {
     if (isRefresh) this.priority = []
     if (this.priority.length) return
 
-    logger.info("-----------")
-    logger.info("加载插件中...")
+    Bot.makeLog("info", "-----------", "Plugin")
+    Bot.makeLog("info", "加载插件中...", "Plugin")
 
     const files = await this.getPlugins()
     this.pluginCount = 0
@@ -96,8 +94,8 @@ class PluginsLoader {
     this.packageTips(packageErr)
     this.createTask()
 
-    logger.info(`加载定时任务[${this.task.length}个]`)
-    logger.info(`加载插件[${this.pluginCount}个]`)
+    Bot.makeLog("info", `加载定时任务[${this.task.length}个]`, "Plugin")
+    Bot.makeLog("info", `加载插件[${this.pluginCount}个]`, "Plugin")
 
     /** 优先级排序 */
     this.priority = lodash.orderBy(this.priority, ["priority"], ["asc"])
@@ -112,16 +110,14 @@ class PluginsLoader {
         pluginArray.push(this.loadPlugin(file, p))
       )
       for (const i of await Promise.allSettled(pluginArray))
-        if (i?.status && i.status != "fulfilled") {
-          logger.error(`加载插件错误：${logger.red(file.name)}`)
-          logger.error(decodeURI(i.reason))
+        if (i?.status && i.status !== "fulfilled") {
+          Bot.makeLog("error", [`插件加载错误 ${logger.red(file.name)}`, i], "Plugin")
         }
     } catch (error) {
       if (packageErr && error.stack.includes("Cannot find package")) {
         packageErr.push({ error, file })
       } else {
-        logger.error(`加载插件错误：${logger.red(file.name)}`)
-        logger.error(decodeURI(error.stack))
+        Bot.makeLog("error", [`插件加载错误 ${logger.red(file.name)}`, error], "Plugin")
       }
     }
   }
@@ -130,11 +126,11 @@ class PluginsLoader {
     if (!p?.prototype) return
     this.pluginCount++
     const plugin = new p
-    logger.debug(`加载插件 [${file.name}][${plugin.name}]`)
+    Bot.makeLog("debug", `加载插件 [${file.name}][${plugin.name}]`, "Plugin")
     /** 执行初始化，返回 return 则跳过加载 */
-    if (plugin.init && await plugin.init() == "return") return
+    if (plugin.init && await plugin.init() === "return") return
     /** 初始化定时任务 */
-    this.collectTask(plugin.task)
+    this.collectTask(plugin.task, plugin.name)
     this.priority.push({
       class: p,
       key: file.name,
@@ -156,14 +152,14 @@ class PluginsLoader {
 
   packageTips(packageErr) {
     if (!packageErr.length) return
-    logger.mark("--------- 插件加载错误 ---------")
+    Bot.makeLog("error", "--------- 插件加载错误 ---------", "Plugin")
     for (const i of packageErr) {
       const pack = i.error.stack.match(/'(.+?)'/g)[0].replace(/'/g, "")
-      logger.mark(`${logger.blue(i.file.name)} 缺少依赖 ${logger.red(pack)}`)
+      Bot.makeLog("error", `${logger.cyan(i.file.name)} 缺少依赖 ${logger.red(pack)}`, "Plugin")
     }
-    logger.mark(`安装插件后请 ${logger.red("pnpm i")} 安装依赖`)
-    logger.mark(`仍报错${logger.red("进入插件目录")} pnpm add 依赖`)
-    logger.mark("--------------------------------")
+    Bot.makeLog("error", `安装插件后请 ${logger.red("pnpm i")} 安装依赖`, "Plugin")
+    Bot.makeLog("error", `仍报错${logger.red("进入插件目录")} pnpm add 依赖`, "Plugin")
+    Bot.makeLog("error", "--------------------------------", "Plugin")
   }
 
   /**
@@ -202,8 +198,10 @@ class PluginsLoader {
         ...plugin.getContext(false, true),
       }
       if (!lodash.isEmpty(context)) {
+        let ret
         for (const fnc in context)
-          plugin[fnc](context[fnc])
+          ret ||= await plugin[fnc](context[fnc])
+        if (ret === "continue") continue
         return
       }
     }
@@ -230,38 +228,35 @@ class PluginsLoader {
     for (const plugin of priority)
       if (plugin.accept) {
         const res = await plugin.accept(e)
-        if (res == "return") return
+        if (res === "return") return
         if (res) break
       }
 
     a: for (const plugin of priority) {
-      /** 正则匹配 */
       if (plugin.rule) for (const v of plugin.rule) {
         /** 判断事件 */
         if (v.event && !this.filtEvent(e, v)) continue
 
+        /** 正则匹配 */
         if (!new RegExp(v.reg).test(e.msg)) continue
-        e.logFnc = `[${plugin.name}][${v.fnc}]`
+        e.logFnc = `${logger.blue(`[${plugin.name}(${v.fnc})]`)}`
 
-        if (v.log !== false)
-          logger.info(`${e.logFnc}${e.logText} ${lodash.truncate(e.msg, { length: 100 })}`)
+        Bot.makeLog(v.log === false ? "debug" : "info", `${e.logText}${e.logFnc}${logger.yellow("[开始处理]")}`, false)
 
         /** 判断权限 */
         if (!this.filtPermission(e, v)) break a
 
         try {
-          const start = Date.now()
+          const start_time = Date.now()
           const res = plugin[v.fnc] && (await plugin[v.fnc](e))
           if (res !== false) {
             /** 设置冷却cd */
             this.setLimit(e)
-            if (v.log !== false)
-              logger.mark(`${e.logFnc} ${lodash.truncate(e.msg, { length: 100 })} 处理完成 ${Date.now() - start}ms`)
+            Bot.makeLog(v.log === false ? "debug" : "mark", `${e.logText}${e.logFnc}${logger.green(`[完成${Bot.getTimeDiff(start_time)}]`)}`, false)
             break a
           }
-        } catch (error) {
-          logger.error(`${e.logFnc}`)
-          logger.error(error.stack)
+        } catch (err) {
+          Bot.makeLog("error", [`${e.logFnc}${e.logText}`, err], false)
           break a
         }
       }
@@ -275,19 +270,19 @@ class PluginsLoader {
     const eventMap = this.eventMap[e.post_type] || []
     const newEvent = []
     for (const i in event) {
-      if (event[i] == "*")
+      if (event[i] === "*")
         newEvent.push(event[i])
       else
         newEvent.push(e[eventMap[i]])
     }
-    return v.event == newEvent.join(".")
+    return v.event === newEvent.join(".")
   }
 
   /** 判断权限 */
   filtPermission(e, v) {
-    if (v.permission == "all" || !v.permission) return true
+    if (v.permission === "all" || !v.permission) return true
 
-    if (v.permission == "master") {
+    if (v.permission === "master") {
       if (e.isMaster) {
         return true
       } else {
@@ -297,13 +292,13 @@ class PluginsLoader {
     }
 
     if (e.isGroup) {
-      if (v.permission == "owner") {
+      if (v.permission === "owner") {
         if (!e.member.is_owner) {
           e.reply("暂无权限，只有群主才能操作")
           return false
         }
       }
-      if (v.permission == "admin") {
+      if (v.permission === "admin") {
         if (!e.member.is_admin) {
           e.reply("暂无权限，只有管理员才能操作")
           return false
@@ -349,7 +344,7 @@ class PluginsLoader {
             e.img = [i.url]
           break
         case "at":
-          if (i.qq == e.self_id)
+          if (i.qq === e.self_id)
             e.atBot = true
           else
             e.at = i.qq
@@ -366,14 +361,14 @@ class PluginsLoader {
           break
         case "xml":
         case "json":
-          e.msg = (e.msg || "") + (typeof i.data == "string" ? i.data : JSON.stringify(i.data))
+          e.msg = (e.msg || "") + (typeof i.data === "string" ? i.data : JSON.stringify(i.data))
           break
       }
     }
 
     e.logText = ""
 
-    if (e.message_type == "private" || e.notice_type == "friend") {
+    if (e.message_type === "private" || e.notice_type === "friend") {
       e.isPrivate = true
 
       if (e.sender) {
@@ -387,7 +382,7 @@ class PluginsLoader {
       }
 
       e.logText = `[${e.sender?.nickname ? `${e.sender.nickname}(${e.user_id})` : e.user_id}]`
-    } else if (e.message_type == "group" || e.notice_type == "group") {
+    } else if (e.message_type === "group" || e.notice_type === "group") {
       e.isGroup = true
 
       if (e.sender) {
@@ -407,6 +402,8 @@ class PluginsLoader {
       e.logText = `[${e.group_name ? `${e.group_name}(${e.group_id})` : e.group_id}, ${e.sender?.card ? `${e.sender.card}(${e.user_id})` : e.user_id}]`
     }
 
+    e.logText = `${logger.cyan(e.logText)}${logger.red(`[${lodash.truncate(e.msg || e.raw_message || Bot.String(e), { length: 100 })}]`)}`
+
     if (e.user_id && cfg.master[e.self_id]?.includes(String(e.user_id))) {
       e.isMaster = true
     }
@@ -476,6 +473,7 @@ class PluginsLoader {
         res = await reply(msg)
       } catch (err) {
         Bot.makeLog("error", ["发送消息错误", msg, err], e.self_id)
+        res = { error: [err] }
       }
 
       if (recallMsg > 0 && res?.message_id) {
@@ -523,27 +521,35 @@ class PluginsLoader {
   }
 
   /** 收集定时任务 */
-  collectTask(task) {
+  collectTask(task, name) {
     for (const i of Array.isArray(task) ? task : [task])
-      if (i.cron && i.name)
+      if (i.cron && i.fnc) {
+        i.name ??= name
         this.task.push(i)
+      }
   }
 
   /** 创建定时任务 */
   createTask() {
-    for (const i of this.task)
-      i.job = schedule.scheduleJob(i.cron, async () => {
-        try {
-          if (i.log == true)
-            logger.mark(`开始定时任务：${i.name}`)
-          await i.fnc()
-          if (i.log == true)
-            logger.mark(`定时任务完成：${i.name}`)
-        } catch (error) {
-          logger.error(`定时任务报错：${i.name}`)
-          logger.error(error)
-        }
-      })
+    const created = []
+    for (const i of this.task) {
+      if (i.job?.cancel) i.job.cancel()
+      const name = `${logger.blue(`[${i.name}(${i.cron})]`)}`
+      if (created.includes(name)) {
+        Bot.makeLog("warn", `重复定时任务 ${name} 已跳过`, "Task")
+        continue
+      }
+      created.push(name)
+      Bot.makeLog("debug", `加载定时任务 ${name}`, "Task")
+      i.job = schedule.scheduleJob(i.cron, async () => { try {
+        const start_time = Date.now()
+        Bot.makeLog(i.log === false ? "debug" : "mark", `${name}${logger.yellow("[开始处理]")}`, false)
+        await i.fnc()
+        Bot.makeLog(i.log === false ? "debug" : "mark", `${name}${logger.green(`[完成${Bot.getTimeDiff(start_time)}]`)}`, false)
+      } catch (err) {
+        Bot.makeLog("error", [name, err], false)
+      }})
+    }
   }
 
   /** 检查命令冷却cd */
@@ -592,10 +598,10 @@ class PluginsLoader {
     let groupCfg = cfg.getGroup(e.self_id, e.group_id)
 
     /** 模式0，未开启前缀 */
-    if (groupCfg.onlyReplyAt == 0 || !groupCfg.botAlias) return true
+    if (groupCfg.onlyReplyAt === 0 || !groupCfg.botAlias) return true
 
     /** 模式2，非主人开启 */
-    if (groupCfg.onlyReplyAt == 2 && e.isMaster) return true
+    if (groupCfg.onlyReplyAt === 2 && e.isMaster) return true
 
     /** at机器人 */
     if (e.atBot) return true
@@ -646,15 +652,14 @@ class PluginsLoader {
       lodash.forEach(app, p => {
         const plugin = new p
         for (const i in this.priority)
-          if (this.priority[i].key == key && this.priority[i].name == plugin.name) {
+          if (this.priority[i].key === key && this.priority[i].name === plugin.name) {
             this.priority[i].class = p
             this.priority[i].priority = plugin.priority
           }
       })
       this.priority = lodash.orderBy(this.priority, ["priority"], ["asc"])
-    } catch (error) {
-      logger.error(`加载插件错误：${logger.red(key)}`)
-      logger.error(decodeURI(error.stack))
+    } catch (err) {
+      Bot.makeLog("error", [`插件加载错误 ${logger.red(key)}`, err], "Plugin")
     }
   }
 
@@ -669,18 +674,16 @@ class PluginsLoader {
 
     /** 监听修改 */
     watcher.on("change", path => {
-      logger.mark(`[修改插件][${dirName}][${appName}]`)
+      Bot.makeLog("mark", `[修改插件][${dirName}][${appName}]`, "Plugin")
       this.changePlugin(key)
     })
 
     /** 监听删除 */
     watcher.on("unlink", async path => {
-      logger.mark(`[卸载插件][${dirName}][${appName}]`)
+      Bot.makeLog("mark", `[卸载插件][${dirName}][${appName}]`, "Plugin")
       /** 停止更新监听 */
       this.watcher[`${dirName}.${appName}`].removeAllListeners("change")
-      for (const i in this.priority)
-        if (this.priority[i].key == key)
-          this.priority.splice(i, 1)
+      this.priority = this.priority.filter(i => i.key !== key)
     })
     this.watcher[`${dirName}.${appName}`] = watcher
   }
@@ -695,7 +698,7 @@ class PluginsLoader {
       watcher.on("add", async PluPath => {
         const appName = path.basename(PluPath)
         if (!appName.endsWith(".js")) return
-        logger.mark(`[新增插件][${dirName}][${appName}]`)
+        Bot.makeLog("mark", `[新增插件][${dirName}][${appName}]`, "Plugin")
         const key = `${dirName}/${appName}`
         await this.importPlugin({
           name: key,

Yunzai/lib/plugins/plugin.js

@@ -1,9 +1,11 @@
 let Common
 try {
   Common = (await import("#miao")).Common
-} catch (err) {}
+} catch {}
 
 const stateArr = {}
+const SymbolTimeout = Symbol("Timeout")
+const SymbolResolve = Symbol("Resolve")
 
 export default class plugin {
   /**
@@ -34,7 +36,7 @@ export default class plugin {
     namespace,
     event = "message",
     priority = 5000,
-    task = { fnc: "", cron: "" },
+    task = { name: "", fnc: "", cron: "" },
     rule = []
   }) {
     /** 插件名称 */
@@ -46,14 +48,7 @@ export default class plugin {
     /** 优先级 */
     this.priority = priority
     /** 定时任务，可以是数组 */
-    this.task = {
-      /** 任务名 */
-      name: "",
-      /** 任务方法名 */
-      fnc: task.fnc || "",
-      /** 任务cron表达式 */
-      cron: task.cron || ""
-    }
+    this.task = task
     /** 命令规则 */
     this.rule = rule
 
@@ -76,27 +71,30 @@ export default class plugin {
 
   conKey(isGroup = false) {
     if (isGroup) {
-      return `${this.name}.${this.e.group_id}`
+      return `${this.name}.${this.group_id || this.groupId || this.e.group_id}`
     } else {
-      return `${this.name}.${this.userId || this.e.user_id}`
+      return `${this.name}.${this.user_id || this.userId || this.e.user_id}`
     }
   }
 
   /**
    * @param type 执行方法
    * @param isGroup 是否群聊
-   * @param time 操作时间，默认120秒
+   * @param time 操作时间
+   * @param timeout 操作超时回复
    */
-  setContext(type, isGroup, time = 120) {
+  setContext(type, isGroup, time = 120, timeout = "操作超时已取消") {
     const key = this.conKey(isGroup)
     if (!stateArr[key]) stateArr[key] = {}
     stateArr[key][type] = this.e
-    if (time) stateArr[key][type].timeout = setTimeout(() => {
+    if (time) stateArr[key][type][SymbolTimeout] = setTimeout(() => {
       if (stateArr[key][type]) {
+        const resolve = stateArr[key][type][SymbolResolve]
         delete stateArr[key][type]
-        this.reply("操作超时已取消", true)
+        resolve ? resolve(false) : this.reply(timeout, true)
       }
     }, time * 1000)
+    return stateArr[key][type]
   }
 
   getContext(type, isGroup) {
@@ -104,18 +102,23 @@ export default class plugin {
     return stateArr[this.conKey(isGroup)]
   }
 
-  /**
-   * @param type 执行方法
-   * @param isGroup 是否群聊
-   */
   finish(type, isGroup) {
     const key = this.conKey(isGroup)
-    if (stateArr[key] && stateArr[key][type]) {
-      clearTimeout(stateArr[key][type].timeout)
+    if (stateArr[key]?.[type]) {
+      clearTimeout(stateArr[key][type][SymbolTimeout])
       delete stateArr[key][type]
     }
   }
 
+  awaitContext(...args) {
+    return new Promise(resolve => this.setContext("resolveContext", ...args)[SymbolResolve] = resolve)
+  }
+
+  resolveContext(context) {
+    this.finish("resolveContext")
+    context[SymbolResolve](this.e)
+  }
+
   async renderImg(plugin, tpl, data, cfg) {
     return Common.render(plugin, tpl, data, { ...cfg, e: this.e })
   }

Yunzai/lib/plugins/runtime.js

@@ -18,8 +18,10 @@ try {
   MysInfo = (await import("../../plugins/genshin/model/mys/mysInfo.js")).default
   NoteUser = (await import("../../plugins/genshin/model/mys/NoteUser.js")).default
   MysUser = (await import("../../plugins/genshin/model/mys/MysUser.js")).default
+} catch {}
+try {
   Version = (await import("#miao")).Version
-} catch (err) {}
+} catch {}
 
 /**
  * 常用的处理方法
@@ -77,13 +79,6 @@ export default class Runtime {
     return MysUser
   }
 
-  static async init(e) {
-    if (MysInfo) await MysInfo.initCache()
-    e.runtime = new Runtime(e)
-    if (NoteUser) await e.runtime.initUser()
-    return e.runtime
-  }
-
   async initUser() {
     let e = this.e
     let user = await NoteUser.create(e)
@@ -141,12 +136,13 @@ export default class Runtime {
    *
    * @param targetType all: 所有用户均可， cookie：查询用户必须具备Cookie
    * @param option MysApi option
+   * @param isSr 是否为星穹铁道
    * @returns {Promise<boolean|MysApi>}
    */
-  async getMysApi(targetType = "all", option = {}) {
+  async getMysApi(targetType = "all", option = {}, isSr = false) {
     let mys = await this.getMysInfo(targetType)
     if (mys.uid && mys?.ckInfo?.ck) {
-      return new MysApi(mys.uid, mys.ckInfo.ck, option)
+      return new MysApi(mys.uid, mys.ckInfo.ck, option, isSr)
     }
     return false
   }
@@ -156,10 +152,11 @@ export default class Runtime {
    * @param uid
    * @param ck
    * @param option
+   * @param isSr 是否为星穹铁道
    * @returns {Promise<MysApi>}
    */
-  async createMysApi(uid, ck, option) {
-    return new MysApi(uid, ck, option)
+  async createMysApi(uid, ck, option, isSr = false) {
+    return new MysApi(uid, ck, option, isSr)
   }
 
   /**
@@ -192,7 +189,7 @@ export default class Runtime {
         scale: 1
       },
       /** miao 相关参数 **/
-      copyright: `Created By TRSS-Yunzai<span class="version">${Version.yunzai}</span> `,
+      copyright: `Created By TRSS-Yunzai<span class="version">${Version?.yunzai}</span> `,
       _res_path: pluResPath,
       _miao_path: miaoResPath,
       _tpl_path: process.cwd() + "/plugins/miao-plugin/resources/common/tpl/",
@@ -206,10 +203,7 @@ export default class Runtime {
       _htmlPath: path,
       pluResPath,
       tplFile: `./plugins/${plugin}/resources/${path}.html`,
-      saveId: data.saveId || data.save_id || paths[paths.length - 1],
-      pageGotoParams: {
-        waitUntil: "networkidle2"
-      }
+      saveId: data.saveId || data.save_id || paths[paths.length - 1]
     }
     // 处理beforeRender
     if (cfg.beforeRender) {
@@ -238,4 +232,14 @@ export default class Runtime {
     }
     return cfg.retType === "msgId" ? ret : true
   }
+
+  static async init(e) {
+    await MysInfo.initCache()
+    e.runtime = new Runtime(e)
+    await e.runtime.initUser()
+    return e.runtime
+  }
 }
+
+if (!MysInfo || !NoteUser)
+  Runtime.init = async e => e.runtime = new Runtime(e)

Yunzai/lib/plugins/stdin.js

@@ -1,11 +1,18 @@
+import readline from "node:readline/promises"
 import fs from "node:fs/promises"
 import path from "node:path"
+import { spawn } from "node:child_process"
 
 Bot.adapter.push(new class stdinAdapter {
   constructor() {
     this.id = "stdin"
     this.name = "标准输入"
     this.path = "data/stdin/"
+    this.catimg = file => new Promise(resolve =>
+      spawn("catimg", ["-l0", file], { stdio: "inherit" })
+        .on("error", () => this.catimg = () => {})
+        .on("close", resolve)
+    )
   }
 
   async sendMsg(msg) {
@@ -19,7 +26,7 @@ Bot.adapter.push(new class stdinAdapter {
       if (i.file) {
         file = await Bot.fileType(i)
         if (Buffer.isBuffer(file.buffer)) {
-          file.path = `${this.path}${file.name || Date.now()}`
+          file.path = `${this.path}${file.name}`
           await fs.writeFile(file.path, file.buffer)
         }
       }
@@ -27,17 +34,18 @@ Bot.adapter.push(new class stdinAdapter {
       switch (i.type) {
         case "text":
           if (i.text.match("\n"))
-            i.text = `\n${i.text}`
-          logger.info(`${logger.blue(`[${this.id}]`)} 发送文本：${i.text}`)
+            i.text = `发送文本：\n${i.text}`
+          Bot.makeLog("info", i.text, this.id)
           break
         case "image":
-          logger.info(`${logger.blue(`[${this.id}]`)} 发送图片：${file.url}\n文件已保存到：${logger.cyan(file.path)}`)
+          await this.catimg(file.path)
+          Bot.makeLog("info", `发送图片：${file.url}\n文件已保存到：${logger.cyan(file.path)}`, this.id)
           break
         case "record":
-          logger.info(`${logger.blue(`[${this.id}]`)} 发送音频：${file.url}\n文件已保存到：${logger.cyan(file.path)}`)
+          Bot.makeLog("info", `发送音频：${file.url}\n文件已保存到：${logger.cyan(file.path)}`, this.id)
           break
         case "video":
-          logger.info(`${logger.blue(`[${this.id}]`)} 发送视频：${file.url}\n文件已保存到：${logger.cyan(file.path)}`)
+          Bot.makeLog("info", `发送视频：${file.url}\n文件已保存到：${logger.cyan(file.path)}`, this.id)
           break
         case "reply":
           break
@@ -47,44 +55,39 @@ Bot.adapter.push(new class stdinAdapter {
           Bot.sendForwardMsg(msg => this.sendMsg(msg), i.data)
           break
         default:
-          i = JSON.stringify(i)
-          if (i.match("\n"))
-            i = `\n${i}`
-          logger.info(`${logger.blue(`[${this.id}]`)} 发送消息：${i}`)
+          Bot.makeLog("info", i, this.id)
       }
     }
-    return { message_id: Date.now() }
+    return { message_id: Date.now().toString(36) }
   }
 
   recallMsg(message_id) {
-    logger.info(`${logger.blue(`[${this.id}]`)} 撤回消息：${message_id}`)
+    Bot.makeLog("info", `撤回消息：${message_id}`, this.id)
   }
 
   async sendFile(file, name = path.basename(file)) {
     const buffer = await Bot.Buffer(file)
     if (!Buffer.isBuffer(buffer)) {
-      logger.error(`${logger.blue(`[${this.id}]`)} 发送文件错误：找不到文件 ${logger.red(file)}`)
+      Bot.makeLog("error", `发送文件错误：找不到文件 ${logger.red(file)}`, this.id)
       return false
     }
 
-    const files = `${this.path}${Date.now()}-${name}`
-    logger.info(`${logger.blue(`[${this.id}]`)} 发送文件：${file}\n文件已保存到：${logger.cyan(files)}`)
+    const files = `${this.path}${Date.now().toString(36)}-${name}`
+    Bot.makeLog("info", `发送文件：${file}\n文件已保存到：${logger.cyan(files)}`, this.id)
     return fs.writeFile(files, buffer)
   }
 
   pickFriend() {
     return {
-      user_id: this.id,
-      nickname: this.name,
-      group_id: this.id,
-      group_name: this.name,
       sendMsg: msg => this.sendMsg(msg),
       recallMsg: message_id => this.recallMsg(message_id),
       sendFile: (file, name) => this.sendFile(file, name),
+      pickMember: function() { return this },
     }
   }
 
   message(msg) {
+    fs.appendFile(`${this.path}history`, `${Date.now().toString(36)}:${msg}\n`, "utf8")
     const data = {
       bot: Bot[this.id],
       self_id: this.id,
@@ -94,20 +97,27 @@ Bot.adapter.push(new class stdinAdapter {
       sender: { user_id: this.id, nickname: this.name },
       message: [{ type: "text", text: msg }],
       raw_message: msg,
-      friend: this.pickFriend(),
     }
-    logger.info(`${logger.blue(`[${data.self_id}]`)} 系统消息：[${data.sender.nickname}(${data.user_id})] ${data.raw_message}`)
-
+    Bot.makeLog("info", `系统消息：${data.raw_message}`, this.id)
     Bot.em(`${data.post_type}.${data.message_type}`, data)
   }
 
-  async load() {
+  async load(force) {
+    if (!(process.stdin.isTTY || process.env.FORCE_TTY || force)) return
+
     await Bot.mkdir(this.path)
     Bot[this.id] = {
       adapter: this,
+      sdk: readline.createInterface({
+        input: process.stdin,
+        output: process.stderr,
+      }).on("line", data => this.message(String(data)))
+        .on("close", () => process.exit(1)),
+
       uin: this.id,
       nickname: this.name,
       version: { id: this.id, name: this.name },
+
       pickFriend: () => this.pickFriend(),
       get stat() { return Bot.stat },
       get pickUser() { return this.pickFriend },
@@ -125,9 +135,13 @@ Bot.adapter.push(new class stdinAdapter {
     }
     Bot[this.id].gml.set(this.id, Bot[this.id].fl)
 
-    process[this.id].on("data", data => this.message(data.toString()))
+    try {
+      Bot[this.id].sdk.history = (await fs.readFile(`${this.path}history`, "utf8")).split("\n").slice(-Bot[this.id].sdk.historySize-1, -1).map(i => i.replace(/^[0-9a-z]+?:/, "")).reverse()
+    } catch (err) {
+      Bot.makeLog("trace", err, this.id)
+    }
 
-    logger.mark(`${logger.blue(`[${this.id}]`)} ${this.name}(${this.id}) 已连接`)
+    Bot.makeLog("mark", `${this.name}(${this.id}) 已连接`, this.id)
     Bot.em(`connect.${this.id}`, { self_id: this.id })
   }
 })

Yunzai/lib/puppeteer/puppeteer.js

@@ -1,23 +1,21 @@
-import Renderer from '../renderer/loader.js'
+import Renderer from "../renderer/loader.js"
 
 /**
  * 暂时保留对手工引用puppeteer.js的兼容
  * 后期会逐步废弃
  * 只提供截图及分片截图功能
  */
-let renderer = Renderer.getRenderer()
+const renderer = Renderer.getRenderer()
 renderer.screenshot = async (name, data) => {
-    let img = await renderer.render(name, data)
-    return img ? segment.image(img) : img
+  const img = await renderer.render(name, data)
+  return img ? segment.image(img) : img
 }
 renderer.screenshots = async (name, data) => {
-    data.multiPage = true
-    let imgs = await renderer.render(name, data) || []
-    let ret = []
-    for (let img of imgs) {
-        ret.push(img ? segment.image(img) : img)
-    }
-    return ret.length > 0 ? ret : false
+  data.multiPage = true
+  const imgs = await renderer.render(name, data) || []
+  const ret = []
+  for (const img of imgs)
+    ret.push(img ? segment.image(img) : img)
+  return ret.length > 0 ? ret : false
 }
-
 export default renderer

Yunzai/lib/renderer/loader.js

@@ -4,11 +4,6 @@ import lodash from "lodash"
 import cfg from "../config/config.js"
 import Renderer from "./Renderer.js"
 
-let Data
-try {
-  Data = (await import("#miao")).Data
-} catch (err) {}
-
 /** 全局变量 Renderer */
 global.Renderer = Renderer
 
@@ -18,7 +13,7 @@ global.Renderer = Renderer
 class RendererLoader {
   constructor() {
     this.renderers = new Map()
-    this.dir = "./renderers"
+    this.dir = "renderers"
     // TODO 渲染器热加载
     this.watcher = {}
   }
@@ -30,15 +25,14 @@ class RendererLoader {
   }
 
   async load() {
-    if (!Data) return
     const subFolders = fs.readdirSync(this.dir, { withFileTypes: true }).filter((dirent) => dirent.isDirectory())
-    for (let subFolder of subFolders) {
-      let name = subFolder.name
+    for (const subFolder of subFolders) {
+      const name = subFolder.name
       try {
-        const rendererFn = await Data.importDefault(`${this.dir}/${name}/index.js`)
-        let configFile = `${this.dir}/${name}/config.yaml`
-        let rendererCfg = fs.existsSync(configFile) ? yaml.parse(fs.readFileSync(configFile, "utf8")) : {}
-        let renderer = rendererFn(rendererCfg)
+        const rendererFn = (await import(`../../${this.dir}/${name}/index.js`)).default
+        const configFile = `${this.dir}/${name}/config.yaml`
+        const rendererCfg = fs.existsSync(configFile) ? yaml.parse(fs.readFileSync(configFile, "utf8")) : {}
+        const renderer = rendererFn(rendererCfg)
         if (!renderer.id || !renderer.type || !renderer.render || !lodash.isFunction(renderer.render)) {
           logger.warn("渲染后端 " + (renderer.id || subFolder.name) + " 不可用")
         }
@@ -57,5 +51,4 @@ class RendererLoader {
   }
 }
 
-
 export default await RendererLoader.init()

Yunzai/lib/tools/docker.sh

@@ -0,0 +1,109 @@
+#TRSS Yunzai Docker 安装脚本 作者：时雨🌌星空
+NAME=v1.0.0;VERSION=202405290
+R="" G="" Y="" C="" B="" O=""
+echo "$B———————————————————————————
+$R TRSS$Y Yunzai$G Docker$C Script$O
+    $G$NAME$C ($VERSION)$O
+$B———————————————————————————
+     $G作者：$C时雨🌌星空$O
+
+$Y- 正在检查环境$O
+"
+DIR="${DIR:-$HOME/Yunzai}"
+CMD="${CMD:-tsyz}"
+CMDPATH="${CMDPATH:-/usr/local/bin}"
+DKNAME="${DKNAME:-Yunzai}"
+DKURL="${DKURL:-docker.nju.edu.cn}"
+GITURL="${GITURL:-https://gitee.com/TimeRainStarSky/Yunzai}"
+APTURL="${APTURL:-mirrors.ustc.edu.cn}"
+APTDEP="${APTDEP:-chromium fonts-lxgw-wenkai fonts-noto-color-emoji}"
+NPMURL="${NPMURL:-https://registry.npmmirror.com}"
+abort(){ echo "
+$R! $@$O";exit 1;}
+mktmp(){ TMP="$DIR/tmp"&&rm -rf "$TMP"&&mkdir -p "$TMP"||abort "缓存目录创建失败";}
+if type docker;then
+  echo "
+$G- Docker 已安装$O
+"
+elif type pacman &>/dev/null;then
+  echo "
+$Y- 正在使用 pacman 安装 Docker$O
+"
+  pacman -Syu --noconfirm --needed --overwrite "*" docker||abort "Docker 安装失败"
+elif type apt &>/dev/null;then
+  echo "
+$Y- 正在使用 apt 安装 Docker$O
+"
+  apt update&&apt install -y docker.io||abort "Docker 安装失败"
+else
+  echo "
+$Y- 正在使用 官方脚本 安装 Docker$O
+"
+  DOWNLOAD_URL="https://$APTURL/docker-ce" bash <(curl -L get.docker.com)||abort "官方脚本 执行失败，请自行安装 Docker 后重试：https://docker.com"
+fi
+docker info||{ systemctl enable --now docker||service docker start&&docker info;}&&echo "
+$G- Docker 已启动$O"||abort "Docker 启动失败"
+N=1
+until echo "
+$Y- 正在从 $C$DKURL$Y 下载 Docker 容器$O
+"
+docker pull "$DKURL/library/node:slim";do
+  echo "
+$R! 下载失败，5秒后切换镜像源$O"
+  sleep 5
+  ((N++))
+  case "$N" in
+    1)DKURL="docker.nju.edu.cn";;
+    2)DKURL="mirror.ccs.tencentyun.com";;
+    3)DKURL="mirror.baidubce.com";;
+    4)DKURL="dockerproxy.com";;
+    5)DKURL="docker.m.daocloud.io";;
+    *)DKURL="docker.io";N=0
+  esac
+done
+echo "
+$Y- 正在构建 Docker 容器$O
+"
+mktmp
+cd "$TMP"
+echo "FROM $DKURL"'/library/node:slim
+RUN sed -i "s|deb.debian.org|'"$APTURL"'|g" /etc/apt/sources.list.d/debian.sources\
+ && apt update\
+ && apt install -y ca-certificates\
+ && sed -i "s|http://'"$APTURL"'|https://'"$APTURL"'|g" /etc/apt/sources.list.d/debian.sources\
+ && apt update\
+ && apt full-upgrade -y\
+ && apt install -y curl git redis-server '"$APTDEP"'\
+ && apt autoremove --purge\
+ && apt clean\
+ && git config --global --add safe.directory "*"\
+ && npm install -g pnpm --registry "'"$NPMURL"'"\
+ && rm -rf /var/cache/* /var/log/* /var/lib/apt /root/.npm\
+ && echo -n "[ -s .git ]||git clone --depth 1 --single-branch \"'"$GITURL"'\" .&&pnpm install --force&&echo -n \"exec node . start\">/start&&exec node . start">/start
+HEALTHCHECK CMD curl -s http://localhost:2536/status||exit 1
+WORKDIR /root/Yunzai
+ENTRYPOINT []
+CMD ["sh","/start"]
+EXPOSE 2536'>Dockerfile
+docker build -t trss:yunzai .||abort "Docker 容器构建失败"
+echo "
+$Y- 正在启动 Docker 容器$O
+"
+docker rm -f $DKNAME 2>/dev/null
+docker image prune -f
+docker run -itd -h Yunzai --name $DKNAME -v "$DIR":/root/Yunzai --restart always $([ $DKNAME = Yunzai ]&&echo "-p2536:2536"||echo "-P") trss:yunzai||abort "Docker 容器启动失败"
+mkdir -vp "$CMDPATH"&&
+echo -n 'if [ -n "$1" ];then case "$1" in
+  s|start)exec docker start '$DKNAME';;
+  st|stop)exec docker stop '$DKNAME';;
+  rs|restart)exec docker restart '$DKNAME';;
+  l|log)exec docker logs -fn"${2:-100}" '$DKNAME';;
+  *)exec docker exec -it '$DKNAME' "$@";;
+esac;else
+  docker logs -n100 '$DKNAME'
+  exec docker attach '$DKNAME'
+fi'>"$CMDPATH/$CMD"&&
+chmod 755 "$CMDPATH/$CMD"||abort "脚本执行命令 $CMDPATH/$CMD 设置失败，手动执行命令：docker attach $DKNAME"
+echo "
+$G- Docker 容器安装完成，启动命令：$C$CMD$O"
+rm -rf "$TMP"

Yunzai/package.json

@@ -18,7 +18,7 @@
     "art-template": "^4.13.2",
     "chalk": "^5.3.0",
     "chokidar": "^3.6.0",
-    "express": "^4.19.1",
+    "express": "^4.19.2",
     "file-type": "^19.0.0",
     "https-proxy-agent": "7.0.4",
     "image-size": "^1.1.1",
@@ -30,20 +30,22 @@
     "node-fetch": "link:lib/modules/node-fetch",
     "node-schedule": "^2.1.1",
     "oicq": "link:lib/modules/oicq",
-    "pm2": "^5.3.1",
+    "pm2": "^5.4.0",
     "puppeteer": "*",
-    "redis": "^4.6.13",
-    "sequelize": "^6.37.1",
+    "redis": "^4.6.14",
+    "sequelize": "^6.37.3",
     "sqlite3": "5.1.6",
-    "ws": "^8.16.0",
-    "yaml": "^2.4.1"
+    "strip-ansi": "^7.1.0",
+    "ulid": "^2.3.0",
+    "ws": "^8.17.0",
+    "yaml": "^2.4.3"
   },
   "devDependencies": {
     "eslint": "^8.57.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.1.1"
+    "eslint-plugin-promise": "^6.2.0"
   },
   "imports": {
     "#miao": "./plugins/miao-plugin/components/index.js",

Yunzai/plugins/.gitignore

@@ -6,6 +6,7 @@
 !system/**
 !other
 !other/**
+!example/package.json
 !example/一言.js
 !example/主动复读.js
 !example/进群退群通知.js

Yunzai/plugins/adapter/ComWeChat.js

@@ -1,23 +1,34 @@
-import { randomUUID } from "node:crypto"
 import path from "node:path"
+import { ulid } from "ulid"
 
 Bot.adapter.push(new class ComWeChatAdapter {
   constructor() {
     this.id = "WeChat"
     this.name = "ComWeChat"
     this.path = this.name
+    this.echo = {}
+    this.timeout = 60000
   }
 
   makeLog(msg) {
     return Bot.String(msg).replace(/(base64:\/\/|"type":"data","data":").*?"/g, '$1..."')
   }
 
-  sendApi(ws, action, params = {}) {
-    const echo = randomUUID()
-    ws.sendMsg({ action, params, echo })
-    return new Promise(resolve => Bot.once(echo, data =>
-      resolve({ ...data, ...data.data })
-    ))
+  sendApi(data, ws, action, params = {}) {
+    const echo = ulid()
+    const request = { action, params, echo }
+    ws.sendMsg(request)
+    return new Promise((resolve, reject) =>
+      this.echo[echo] = {
+        request, resolve, reject,
+        timeout: setTimeout(() => {
+          reject(Object.assign(request, { timeout: this.timeout }))
+          delete this.echo[echo]
+          Bot.makeLog("error", ["请求超时", request], data.self_id)
+          ws.terminate()
+        }, this.timeout),
+      }
+    )
   }
 
   async uploadFile(data, file) {
@@ -44,7 +55,7 @@ Bot.adapter.push(new class ComWeChatAdapter {
       msg = [msg]
     const msgs = []
     for (let i of msg) {
-      if (typeof i != "object")
+      if (typeof i !== "object")
         i = { type: "text", data: { text: i }}
       else if (!i.data)
         i = { type: i.type, data: { ...i, type: undefined }}
@@ -63,7 +74,7 @@ Bot.adapter.push(new class ComWeChatAdapter {
           i.type = "file"
           break
         case "at":
-          if (i.data.qq == "all")
+          if (i.data.qq === "all")
             i = { type: "mention_all", data: {}}
           else
             i = { type: "mention", data: { user_id: i.data.qq }}
@@ -74,8 +85,11 @@ Bot.adapter.push(new class ComWeChatAdapter {
         case "node":
           await Bot.sendForwardMsg(send, i.data)
           continue
+        case "raw":
+          i = i.data
+          break
         default:
-          i = { type: "text", data: { text: JSON.stringify(i) }}
+          i = { type: "text", data: { text: Bot.String(i) }}
       }
       msgs.push(i)
     }
@@ -107,7 +121,7 @@ Bot.adapter.push(new class ComWeChatAdapter {
     for (const i of (await data.bot.sendApi("get_friend_list")).data)
       array.push({
         ...i,
-        nickname: i.user_remark == "null" ? i.user_displayname || i.user_name : i.user_remark,
+        nickname: i.user_remark === "null" ? i.user_displayname || i.user_name : i.user_remark,
       })
     return array
   }
@@ -237,7 +251,7 @@ Bot.adapter.push(new class ComWeChatAdapter {
     Bot[data.self_id] = {
       adapter: this,
       ws: ws,
-      sendApi: (action, params) => this.sendApi(ws, action, params),
+      sendApi: (action, params) => this.sendApi(data, ws, action, params),
       stat: { ...data.status, start_time: data.time },
 
       info: {},
@@ -265,9 +279,9 @@ Bot.adapter.push(new class ComWeChatAdapter {
     if (!Bot.uin.includes(data.self_id))
       Bot.uin.push(data.self_id)
 
-    data.bot.info = (await data.bot.sendApi("get_self_info")).data
+    data.bot.info = (await data.bot.sendApi("get_self_info").catch(i => i.error)).data
     data.bot.version = {
-      ...(await data.bot.sendApi("get_version")).data,
+      ...(await data.bot.sendApi("get_version").catch(i => i.error)).data,
       id: this.id,
       name: this.name,
     }
@@ -428,7 +442,7 @@ Bot.adapter.push(new class ComWeChatAdapter {
     }
 
     if (data.type) {
-      if (data.type != "meta" && !Bot.uin.includes(data.self_id)) {
+      if (data.type !== "meta" && !Bot.uin.includes(data.self_id)) {
         Bot.makeLog("warn", `找不到对应Bot，忽略消息：${logger.magenta(data.raw)}`, data.self_id)
         return false
       }
@@ -450,8 +464,17 @@ Bot.adapter.push(new class ComWeChatAdapter {
         default:
           Bot.makeLog("warn", `未知消息：${logger.magenta(data.raw)}`, data.self_id)
       }
-    } else if (data.echo) {
-      Bot.emit(data.echo, data)
+    } else if (data.echo && this.echo[data.echo]) {
+      if (data.retcode !== 0)
+        this.echo[data.echo].reject(Object.assign(
+          this.echo[data.echo].request, { error: data }
+        ))
+      else
+        this.echo[data.echo].resolve(data.data ? new Proxy(data, {
+          get: (target, prop) => target.data[prop] ?? target[prop],
+        }) : data)
+      clearTimeout(this.echo[data.echo].timeout)
+      delete this.echo[data.echo]
     } else {
       Bot.makeLog("warn", `未知消息：${logger.magenta(data.raw)}`, data.self_id)
     }

Yunzai/plugins/adapter/GSUIDCore.js

@@ -28,7 +28,7 @@ Bot.adapter.push(new class GSUIDCoreAdapter {
     } else return false
 
     if (button.permission) {
-      if (button.permission == "admin") {
+      if (button.permission === "admin") {
         msg.permission = 1
       } else {
         msg.permission = 0
@@ -58,7 +58,7 @@ Bot.adapter.push(new class GSUIDCoreAdapter {
       msg = [msg]
     const msgs = []
     for (let i of msg) {
-      if (typeof i != "object")
+      if (typeof i !== "object")
         i = { type: "text", text: i }
 
       if (i.file) {
@@ -100,8 +100,11 @@ Bot.adapter.push(new class GSUIDCoreAdapter {
             array.push(...await this.makeMsg(message))
           i.data = array
           break
-        } default:
-          i = { type: "text", data: JSON.stringify(i) }
+        } case "raw":
+          i = i.data
+          break
+        default:
+          i = { type: "text", data: Bot.String(i) }
       }
       msgs.push(i)
     }
@@ -118,7 +121,7 @@ Bot.adapter.push(new class GSUIDCoreAdapter {
       target_id: data.user_id,
       content,
     })
-    return { message_id: Date.now() }
+    return { message_id: Date.now().toString(36) }
   }
 
   async sendGroupMsg(data, msg) {
@@ -132,7 +135,7 @@ Bot.adapter.push(new class GSUIDCoreAdapter {
       target_id: target[1],
       content,
     })
-    return { message_id: Date.now() }
+    return { message_id: Date.now().toString(36) }
   }
 
   pickFriend(id, user_id) {
@@ -260,15 +263,15 @@ Bot.adapter.push(new class GSUIDCoreAdapter {
           break
         case "node":
           data.message.push({ type: "node", data: i.data })
-          data.raw_message += `[合并转发：${JSON.stringify(i.data)}]`
+          data.raw_message += `[合并转发：${Bot.String(i.data)}]`
           break
         default:
           data.message.push(i)
-          data.raw_message += JSON.stringify(i)
+          data.raw_message += Bot.String(i)
       }
     }
 
-    if (raw.user_type == "direct") {
+    if (raw.user_type === "direct") {
       data.message_type = "private"
       Bot.makeLog("info", `好友消息：${data.raw_message}`, `${data.self_id} <= ${data.user_id}`)
     } else {

Yunzai/plugins/adapter/OPQBot.js

@@ -3,6 +3,8 @@ Bot.adapter.push(new class OPQBotAdapter {
     this.id = "QQ"
     this.name = "OPQBot"
     this.path = this.name
+    this.echo = {}
+    this.timeout = 60000
     this.CommandId = {
       FriendImage: 1,
       GroupImage: 2,
@@ -13,9 +15,19 @@ Bot.adapter.push(new class OPQBotAdapter {
 
   sendApi(id, CgiCmd, CgiRequest) {
     const ReqId = Math.round(Math.random()*10**16)
-    Bot[id].ws.sendMsg({ BotUin: String(id), CgiCmd, CgiRequest, ReqId })
-    return new Promise(resolve =>
-      Bot.once(ReqId, data => resolve(data)))
+    const request = { BotUin: String(id), CgiCmd, CgiRequest, ReqId }
+    Bot[id].ws.sendMsg(request)
+    return new Promise((resolve, reject) =>
+      this.echo[ReqId] = {
+        request, resolve, reject,
+        timeout: setTimeout(() => {
+          reject(Object.assign(request, { timeout: this.timeout }))
+          delete this.echo[ReqId]
+          Bot.makeLog("error", ["请求超时", request], id)
+          Bot[id].ws.terminate()
+        }, this.timeout),
+      }
+    )
   }
 
   makeLog(msg) {
@@ -46,7 +58,7 @@ Bot.adapter.push(new class OPQBotAdapter {
     }
 
     for (let i of msg) {
-      if (typeof i != "object")
+      if (typeof i !== "object")
         i = { type: "text", text: i }
 
       switch (i.type) {
@@ -71,8 +83,12 @@ Bot.adapter.push(new class OPQBotAdapter {
         case "node":
           await Bot.sendForwardMsg(msg => this.sendMsg(send, upload, msg), i.data)
           continue
+        case "raw":
+          for (const i in i.data)
+            message[i] = i.data[i]
+          continue
         default:
-          message.Content += JSON.stringify(i)
+          message.Content += Bot.String(i)
       }
     }
 
@@ -141,7 +157,7 @@ Bot.adapter.push(new class OPQBotAdapter {
     return {
       ...i,
       sendMsg: msg => this.sendFriendMsg(i, msg),
-      getAvatarUrl: () => `https://q1.qlogo.cn/g?b=qq&s=0&nk=${user_id}`,
+      getAvatarUrl: () => `https://q.qlogo.cn/g?b=qq&s=0&nk=${user_id}`,
     }
   }
 
@@ -267,7 +283,7 @@ Bot.adapter.push(new class OPQBotAdapter {
       uin: id,
       info: { id },
       get nickname() { return this.info.nickname },
-      get avatar() { return `https://q1.qlogo.cn/g?b=qq&s=0&nk=${this.uin}` },
+      get avatar() { return `https://q.qlogo.cn/g?b=qq&s=0&nk=${this.uin}` },
 
       version: {
         id: this.id,
@@ -310,8 +326,15 @@ Bot.adapter.push(new class OPQBotAdapter {
         this.makeBot(id, ws)
 
       this.makeEvent(id, data.CurrentPacket)
-    } else if (data.ReqId) {
-      Bot.emit(data.ReqId, data)
+    } else if (data.ReqId && this.echo[data.ReqId]) {
+      if (data.CgiBaseResponse?.Ret !== 0)
+        this.echo[data.ReqId].reject(Object.assign(
+          this.echo[data.ReqId].request, { error: data }
+        ))
+      else
+        this.echo[data.ReqId].resolve(data)
+      clearTimeout(this.echo[data.ReqId].timeout)
+      delete this.echo[data.ReqId]
     } else {
       Bot.makeLog("warn", `未知消息：${logger.magenta(data.raw)}`, id)
     }

Yunzai/plugins/adapter/OneBotv11.js

@@ -1,28 +1,34 @@
-import { randomUUID } from "node:crypto"
 import path from "node:path"
+import { ulid } from "ulid"
 
 Bot.adapter.push(new class OneBotv11Adapter {
   constructor() {
     this.id = "QQ"
     this.name = "OneBotv11"
     this.path = this.name
+    this.echo = {}
+    this.timeout = 60000
   }
 
   makeLog(msg) {
     return Bot.String(msg).replace(/base64:\/\/.*?(,|]|")/g, "base64://...$1")
   }
 
-  sendApi(ws, action, params) {
-    const echo = randomUUID()
-    ws.sendMsg({ action, params, echo })
-    return new Promise(resolve => Bot.once(echo, data =>
-      resolve({ ...data, ...data.data })
-    ))
-  }
-
-  setProfile(data, profile) {
-    Bot.makeLog("info", `设置资料：${JSON.stringify(profile)}`, data.self_id)
-    return data.bot.sendApi("set_qq_profile", profile)
+  sendApi(data, ws, action, params = {}) {
+    const echo = ulid()
+    const request = { action, params, echo }
+    ws.sendMsg(request)
+    return new Promise((resolve, reject) =>
+      this.echo[echo] = {
+        request, resolve, reject,
+        timeout: setTimeout(() => {
+          reject(Object.assign(request, { timeout: this.timeout }))
+          delete this.echo[echo]
+          Bot.makeLog("error", ["请求超时", request], data.self_id)
+          ws.terminate()
+        }, this.timeout),
+      }
+    )
   }
 
   async makeFile(file) {
@@ -38,7 +44,7 @@ Bot.adapter.push(new class OneBotv11Adapter {
     const msgs = []
     const forward = []
     for (let i of msg) {
-      if (typeof i != "object")
+      if (typeof i !== "object")
         i = { type: "text", data: { text: i }}
       else if (!i.data)
         i = { type: i.type, data: { ...i, type: undefined }}
@@ -55,6 +61,9 @@ Bot.adapter.push(new class OneBotv11Adapter {
         case "node":
           forward.push(...i.data)
           continue
+        case "raw":
+          i = i.data
+          break
       }
 
       if (i.data.file)
@@ -79,7 +88,7 @@ Bot.adapter.push(new class OneBotv11Adapter {
 
     if (message.length)
       ret.push(await send(message))
-    if (ret.length == 1) return ret[0]
+    if (ret.length === 1) return ret[0]
 
     const message_id = []
     for (const i of ret) if (i?.message_id)
@@ -131,7 +140,7 @@ Bot.adapter.push(new class OneBotv11Adapter {
   parseMsg(msg) {
     const array = []
     for (const i of Array.isArray(msg) ? msg : [msg])
-      if (typeof i == "object")
+      if (typeof i === "object")
         array.push({ ...i.data, type: i.type })
       else
         array.push({ type: "text", text: String(i) })
@@ -368,6 +377,19 @@ Bot.adapter.push(new class OneBotv11Adapter {
     })
   }
 
+
+  setProfile(data, profile) {
+    Bot.makeLog("info", `设置资料：${Bot.String(profile)}`, data.self_id)
+    return data.bot.sendApi("set_qq_profile", profile)
+  }
+
+  async setAvatar(data, file) {
+    Bot.makeLog("info", `设置头像：${file}`, data.self_id)
+    return data.bot.sendApi("set_qq_avatar", {
+      file: await this.makeFile(file),
+    })
+  }
+
   sendLike(data, times) {
     Bot.makeLog("info", `点赞：${times}次`, `${data.self_id} => ${data.user_id}`)
     return data.bot.sendApi("send_like", {
@@ -386,10 +408,9 @@ Bot.adapter.push(new class OneBotv11Adapter {
 
   async setGroupAvatar(data, file) {
     Bot.makeLog("info", `设置群头像：${file}`, `${data.self_id} => ${data.group_id}`)
-    file = await Bot.Buffer(file, { http: true })
     return data.bot.sendApi("set_group_portrait", {
       group_id: data.group_id,
-      file,
+      file: await this.makeFile(file),
     })
   }
 
@@ -574,13 +595,13 @@ Bot.adapter.push(new class OneBotv11Adapter {
       sendForwardMsg: msg => this.sendFriendForwardMsg(i, msg),
       sendFile: (file, name) => this.sendFriendFile(i, file, name),
       getInfo: () => this.getFriendInfo(i),
-      getAvatarUrl: () => `https://q1.qlogo.cn/g?b=qq&s=0&nk=${user_id}`,
+      getAvatarUrl: () => i.avatar || `https://q.qlogo.cn/g?b=qq&s=0&nk=${user_id}`,
       thumbUp: times => this.sendLike(i, times),
     }
   }
 
   pickMember(data, group_id, user_id) {
-    if (typeof group_id == "string" && group_id.match("-")) {
+    if (typeof group_id === "string" && group_id.match("-")) {
       const guild_id = group_id.split("-")
       const i = {
         ...data,
@@ -607,17 +628,18 @@ Bot.adapter.push(new class OneBotv11Adapter {
       ...this.pickFriend(i, user_id),
       ...i,
       getInfo: () => this.getMemberInfo(i),
+      getAvatarUrl: () => i.avatar || `https://q.qlogo.cn/g?b=qq&s=0&nk=${user_id}`,
       poke: () => this.sendGroupMsg(i, { type: "poke", qq: user_id }),
       mute: duration => this.setGroupBan(i, i.user_id, duration),
       kick: reject_add_request => this.setGroupKick(i, i.user_id, reject_add_request),
       get is_friend() { return data.bot.fl.has(user_id) },
-      get is_owner() { return i.role == "owner" },
-      get is_admin() { return i.role == "admin" },
+      get is_owner() { return i.role === "owner" },
+      get is_admin() { return i.role === "admin" },
     }
   }
 
   pickGroup(data, group_id) {
-    if (typeof group_id == "string" && group_id.match("-")) {
+    if (typeof group_id === "string" && group_id.match("-")) {
       const guild_id = group_id.split("-")
       const i = {
         ...data.bot.gl.get(group_id),
@@ -656,7 +678,7 @@ Bot.adapter.push(new class OneBotv11Adapter {
       sendForwardMsg: msg => this.sendGroupForwardMsg(i, msg),
       sendFile: (file, name) => this.sendGroupFile(i, file, undefined, name),
       getInfo: () => this.getGroupInfo(i),
-      getAvatarUrl: () => `https://p.qlogo.cn/gh/${group_id}/${group_id}/0`,
+      getAvatarUrl: () => i.avatar || `https://p.qlogo.cn/gh/${group_id}/${group_id}/0`,
       getChatHistory: (seq, cnt) => this.getGroupMsgHistory(i, seq, cnt),
       getMemberArray: () => this.getMemberArray(i),
       getMemberList: () => this.getMemberList(i),
@@ -674,8 +696,8 @@ Bot.adapter.push(new class OneBotv11Adapter {
       kickMember: (user_id, reject_add_request) => this.setGroupKick(i, user_id, reject_add_request),
       quit: is_dismiss => this.setGroupLeave(i, is_dismiss),
       fs: this.getGroupFs(i),
-      get is_owner() { return data.bot.gml.get(group_id)?.get(data.self_id)?.role == "owner" },
-      get is_admin() { return data.bot.gml.get(group_id)?.get(data.self_id)?.role == "admin" },
+      get is_owner() { return data.bot.gml.get(group_id)?.get(data.self_id)?.role === "owner" },
+      get is_admin() { return data.bot.gml.get(group_id)?.get(data.self_id)?.role === "admin" },
     }
   }
 
@@ -683,7 +705,7 @@ Bot.adapter.push(new class OneBotv11Adapter {
     Bot[data.self_id] = {
       adapter: this,
       ws: ws,
-      sendApi: (action, params) => this.sendApi(ws, action, params),
+      sendApi: (action, params) => this.sendApi(data, ws, action, params),
       stat: {
         start_time: data.time,
         stat: {},
@@ -699,10 +721,11 @@ Bot.adapter.push(new class OneBotv11Adapter {
       info: {},
       get uin() { return this.info.user_id },
       get nickname() { return this.info.nickname },
-      get avatar() { return `https://q1.qlogo.cn/g?b=qq&s=0&nk=${this.uin}` },
+      get avatar() { return `https://q.qlogo.cn/g?b=qq&s=0&nk=${this.uin}` },
 
       setProfile: profile => this.setProfile(data, profile),
       setNickname: nickname => this.setProfile(data, { nickname }),
+      setAvatar: file => this.setAvatar(data, file),
 
       pickFriend: user_id => this.pickFriend(data, user_id),
       get pickUser() { return this.pickFriend },
@@ -733,13 +756,13 @@ Bot.adapter.push(new class OneBotv11Adapter {
     data.bot.sendApi("_set_model_show", {
       model: data.bot.model,
       model_show: data.bot.model,
-    })
+    }).catch(() => {})
 
-    data.bot.info = (await data.bot.sendApi("get_login_info")).data
-    data.bot.guild_info = (await data.bot.sendApi("get_guild_service_profile")).data
-    data.bot.clients = (await data.bot.sendApi("get_online_clients")).clients
+    data.bot.info = (await data.bot.sendApi("get_login_info").catch(i => i.error)).data
+    data.bot.guild_info = (await data.bot.sendApi("get_guild_service_profile").catch(i => i.error)).data
+    data.bot.clients = (await data.bot.sendApi("get_online_clients").catch(i => i.error)).clients
     data.bot.version = {
-      ...(await data.bot.sendApi("get_version_info")).data,
+      ...(await data.bot.sendApi("get_version_info").catch(i => i.error)).data,
       id: this.id,
       name: this.name,
       get version() {
@@ -773,7 +796,7 @@ Bot.adapter.push(new class OneBotv11Adapter {
       } case "guild":
         data.message_type = "group"
         data.group_id = `${data.guild_id}-${data.channel_id}`
-        Bot.makeLog("info", `频道消息：[${data.sender.nickname}] ${JSON.stringify(data.message)}`, `${data.self_id} <= ${data.group_id}, ${data.user_id}`)
+        Bot.makeLog("info", `频道消息：[${data.sender.nickname}] ${Bot.String(data.message)}`, `${data.self_id} <= ${data.group_id}, ${data.user_id}`)
         Object.defineProperty(data, "friend", { get() { return this.member || {}}})
         break
       default:
@@ -793,24 +816,24 @@ Bot.adapter.push(new class OneBotv11Adapter {
         break
       case "group_increase":
         Bot.makeLog("info", `群成员增加：${data.operator_id} => ${data.user_id} ${data.sub_type}`, `${data.self_id} <= ${data.group_id}`)
-        if (data.user_id == data.self_id)
+        if (data.user_id === data.self_id)
           data.bot.getGroupMemberMap()
         else
           data.bot.pickGroup(data.group_id).getMemberMap()
         break
       case "group_decrease":
         Bot.makeLog("info", `群成员减少：${data.operator_id} => ${data.user_id} ${data.sub_type}`, `${data.self_id} <= ${data.group_id}`)
-        if (data.user_id == data.self_id)
+        if (data.user_id === data.self_id)
           data.bot.getGroupMemberMap()
         else
           data.bot.pickGroup(data.group_id).getMemberMap()
         break
       case "group_admin":
         Bot.makeLog("info", `群管理员变动：${data.sub_type}`, `${data.self_id} <= ${data.group_id}, ${data.user_id}`)
-        data.set = data.sub_type == "set"
+        data.set = data.sub_type === "set"
         break
       case "group_upload":
-        Bot.makeLog("info", `群文件上传：${JSON.stringify(data.file)}`, `${data.self_id} <= ${data.group_id}, ${data.user_id}`)
+        Bot.makeLog("info", `群文件上传：${Bot.String(data.file)}`, `${data.self_id} <= ${data.group_id}, ${data.user_id}`)
         break
       case "group_ban":
         Bot.makeLog("info", `群禁言：${data.operator_id} => ${data.user_id} ${data.sub_type} ${data.duration}秒`, `${data.self_id} <= ${data.group_id}`)
@@ -846,10 +869,10 @@ Bot.adapter.push(new class OneBotv11Adapter {
         Bot.makeLog("info", `群名片更新：${data.card_old} => ${data.card_new}`, `${data.self_id} <= ${data.group_id}, ${data.user_id}`)
         break
       case "offline_file":
-        Bot.makeLog("info", `离线文件：${JSON.stringify(data.file)}`, `${data.self_id} <= ${data.user_id}`)
+        Bot.makeLog("info", `离线文件：${Bot.String(data.file)}`, `${data.self_id} <= ${data.user_id}`)
         break
       case "client_status":
-        Bot.makeLog("info", `客户端${data.online ? "上线" : "下线"}：${JSON.stringify(data.client)}`, data.self_id)
+        Bot.makeLog("info", `客户端${data.online ? "上线" : "下线"}：${Bot.String(data.client)}`, data.self_id)
         data.clients = (await data.bot.sendApi("get_online_clients")).clients
         data.bot.clients = data.clients
         break
@@ -862,20 +885,20 @@ Bot.adapter.push(new class OneBotv11Adapter {
         break
       case "message_reactions_updated":
         data.notice_type = "guild_message_reactions_updated"
-        Bot.makeLog("info", `频道消息表情贴：${data.message_id} ${JSON.stringify(data.current_reactions)}`, `${data.self_id} <= ${data.guild_id}-${data.channel_id}, ${data.user_id}`)
+        Bot.makeLog("info", `频道消息表情贴：${data.message_id} ${Bot.String(data.current_reactions)}`, `${data.self_id} <= ${data.guild_id}-${data.channel_id}, ${data.user_id}`)
         break
       case "channel_updated":
         data.notice_type = "guild_channel_updated"
-        Bot.makeLog("info", `子频道更新：${JSON.stringify(data.old_info)} => ${JSON.stringify(data.new_info)}`, `${data.self_id} <= ${data.guild_id}-${data.channel_id}, ${data.user_id}`)
+        Bot.makeLog("info", `子频道更新：${Bot.String(data.old_info)} => ${Bot.String(data.new_info)}`, `${data.self_id} <= ${data.guild_id}-${data.channel_id}, ${data.user_id}`)
         break
       case "channel_created":
         data.notice_type = "guild_channel_created"
-        Bot.makeLog("info", `子频道创建：${JSON.stringify(data.channel_info)}`, `${data.self_id} <= ${data.guild_id}-${data.channel_id}, ${data.user_id}`)
+        Bot.makeLog("info", `子频道创建：${Bot.String(data.channel_info)}`, `${data.self_id} <= ${data.guild_id}-${data.channel_id}, ${data.user_id}`)
         data.bot.getGroupMap()
         break
       case "channel_destroyed":
         data.notice_type = "guild_channel_destroyed"
-        Bot.makeLog("info", `子频道删除：${JSON.stringify(data.channel_info)}`, `${data.self_id} <= ${data.guild_id}-${data.channel_id}, ${data.user_id}`)
+        Bot.makeLog("info", `子频道删除：${Bot.String(data.channel_info)}`, `${data.self_id} <= ${data.guild_id}-${data.channel_id}, ${data.user_id}`)
         data.bot.getGroupMap()
         break
       default:
@@ -944,7 +967,7 @@ Bot.adapter.push(new class OneBotv11Adapter {
     }
 
     if (data.post_type) {
-      if (data.meta_event_type != "lifecycle" && !Bot.uin.includes(data.self_id)) {
+      if (data.meta_event_type !== "lifecycle" && !Bot.uin.includes(data.self_id)) {
         Bot.makeLog("warn", `找不到对应Bot，忽略消息：${logger.magenta(data.raw)}`, data.self_id)
         return false
       }
@@ -970,8 +993,17 @@ Bot.adapter.push(new class OneBotv11Adapter {
         default:
           Bot.makeLog("warn", `未知消息：${logger.magenta(data.raw)}`, data.self_id)
       }
-    } else if (data.echo) {
-      Bot.emit(data.echo, data)
+    } else if (data.echo && this.echo[data.echo]) {
+      if (![0, 1].includes(data.retcode))
+        this.echo[data.echo].reject(Object.assign(
+          this.echo[data.echo].request, { error: data }
+        ))
+      else
+        this.echo[data.echo].resolve(data.data ? new Proxy(data, {
+          get: (target, prop) => target.data[prop] ?? target[prop],
+        }) : data)
+      clearTimeout(this.echo[data.echo].timeout)
+      delete this.echo[data.echo]
     } else {
       Bot.makeLog("warn", `未知消息：${logger.magenta(data.raw)}`, data.self_id)
     }

Yunzai/plugins/example/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "example",
+  "type": "module"
+}

Yunzai/plugins/example/主动复读.js

@@ -23,14 +23,14 @@ export class example2 extends plugin {
     /** 设置上下文，后续接收到内容会执行doRep方法 */
     this.setContext("doRep")
     /** 回复 */
-    await this.reply("请发送要复读的内容", false, { at: true })
+    return this.reply("请发送要复读的内容", false, { at: true })
   }
 
   /** 接受内容 */
   doRep() {
-    /** 复读内容 */
-    this.reply(this.e.message, false, { recallMsg: 5 })
     /** 结束上下文 */
     this.finish("doRep")
+    /** 复读内容 */
+    return this.reply(this.e.message, false, { recallMsg: 5 })
   }
 }

Yunzai/plugins/other/install.js

@@ -4,9 +4,11 @@ let insing = false
 const list = {
   "Atlas":"https://gitee.com/Nwflower/atlas",
   "genshin"  :"https://gitee.com/TimeRainStarSky/Yunzai-genshin",
+  "DF-Plugin":"https://gitee.com/DenFengLai/DF-Plugin",
   "ws-plugin":"https://gitee.com/xiaoye12123/ws-plugin",
   "TRSS-Plugin"   :"https://Yunzai.TRSS.me",
   "miao-plugin"   :"https://gitee.com/yoimiya-kokomi/miao-plugin",
+  "Guoba-Plugin"  :"https://gitee.com/guoba-yunzai/guoba-plugin",
   "yenai-plugin"  :"https://gitee.com/yeyang52/yenai-plugin",
   "flower-plugin" :"https://gitee.com/Nwflower/flower-plugin",
   "xianyu-plugin" :"https://gitee.com/suancaixianyu/xianyu-plugin",
@@ -24,6 +26,9 @@ const list = {
   "ICQQ-Plugin"   :"https://gitee.com/TimeRainStarSky/Yunzai-ICQQ-Plugin",
   "KOOK-Plugin"   :"https://gitee.com/TimeRainStarSky/Yunzai-KOOK-Plugin",
 }
+const map = {}
+for (const i in list)
+  map[i.replace(/-[Pp]lugin$/, "")] = i
 
 export class install extends plugin {
   constructor() {
@@ -33,7 +38,7 @@ export class install extends plugin {
       event: "message",
       rule: [
         {
-          reg: `^#安装(插件|${Object.keys(list).join("|")})$`,
+          reg: `^#安装(插件|${Object.keys(map).join("|")})(-[Pp]lugin)?$`,
           fnc: "install",
           permission: "master"
         }
@@ -43,16 +48,18 @@ export class install extends plugin {
 
   async install() {
     if (insing) {
-      await this.reply("已有命令安装中..请勿重复操作")
+      await this.reply("正在安装，请稍候再试")
       return false
     }
 
-    const name = this.e.msg.replace(/^#安装/, "").trim()
+    let name = this.e.msg.replace(/^#安装(.+?)(-[Pp]lugin)?$/, "$1")
+    if (map[name]) name = map[name]
+
     if (name == "插件") {
       let msg = "\n"
-      for (const name in list)
-        if (!await Bot.fsStat(`plugins/${name}`))
-          msg += `${name}\n`
+      for (const i in list)
+        if (!await Bot.fsStat(`plugins/${i}`))
+          msg += `${i}\n`
 
       if (msg == "\n")
         msg = "暂无可安装插件"
@@ -68,47 +75,40 @@ export class install extends plugin {
       await this.reply(`${name} 插件已安装`)
       return false
     }
-    await this.runInstall(name, list[name], path)
-    this.restart()
+    return this.runInstall(name, list[name], path)
   }
 
   async runInstall(name, url, path) {
-    logger.mark(`${this.e.logFnc} 开始安装：${name} 插件`)
+    logger.mark(`${this.e.logFnc} 开始安装 ${name} 插件`)
     await this.reply(`开始安装 ${name} 插件`)
 
-    const cm = `git clone --depth 1 --single-branch "${url}" "${path}"`
     insing = true
-    const ret = await Bot.exec(cm)
+    const ret = await Bot.exec(`git clone --depth 1 --single-branch "${url}" "${path}"`)
     if (await Bot.fsStat(`${path}/package.json`))
       await Bot.exec("pnpm install")
     insing = false
 
     if (ret.error) {
-      logger.mark(`${this.e.logFnc} 插件安装失败：${name}`)
-      this.gitErr(ret.error, ret.stdout)
+      logger.mark(`${this.e.logFnc} ${name} 插件安装错误`)
+      this.gitErr(name, ret.error.message, ret.stdout)
       return false
     }
+    return this.restart()
   }
 
-  async gitErr(err, stdout) {
-    let msg = "安装失败！"
-    let errMsg = err.toString()
-    stdout = stdout.toString()
-
-    if (errMsg.includes('Timed out')) {
-      const remote = errMsg.match(/'(.+?)'/g)[0].replace(/'/g, '')
-      return this.reply(`${msg}\n连接超时：${remote}`)
-    }
-
-    if (/Failed to connect|unable to access/g.test(errMsg)) {
-      const remote = errMsg.match(/'(.+?)'/g)[0].replace(/'/g, '')
-      return this.reply(`${msg}\n连接失败：${remote}`)
-    }
+  gitErrUrl(error) {
+    return error.replace(/(Cloning into|正克隆到)\s*'.+?'/g, "").match(/'(.+?)'/g)[0].replace(/'(.+?)'/, "$1")
+  }
 
-    await this.reply([errMsg, stdout])
+  async gitErr(name, error, stdout) {
+    if (/unable to access|无法访问/.test(error))
+      await this.reply(`远程仓库连接错误：${this.gitErrUrl(error)}`)
+    else if (/not found|未找到|does not (exist|appear)|不存在|Authentication failed|鉴权失败/.test(error))
+      await this.reply(`远程仓库地址错误：${this.gitErrUrl(error)}`)
+    else await this.reply(`${name} 插件安装错误\n${error}\n${stdout}`)
   }
 
   restart() {
-    new Restart(this.e).restart()
+    return new Restart(this.e).restart()
   }
 }

Yunzai/plugins/other/restart.js

@@ -1,11 +1,38 @@
 import cfg from "../../lib/config/config.js"
 import { spawn } from "child_process"
+import PluginsLoader from "../../lib/plugins/loader.js"
+
+const temp = {}
+class Start extends plugin {
+  constructor(e) {
+    super({
+      name: "开机",
+      dsc: "#开机",
+      event: "message",
+      rule: [
+        {
+          reg: "^#开机$",
+          fnc: "start"
+        }
+      ]
+    })
+    if (e) this.e = e
+  }
+
+  async start() {
+    if (!this.e.isMaster || !temp.priority) return false
+    PluginsLoader.priority = temp.priority
+    delete temp.priority
+    temp.start_time = Date.now()
+    return this.reply(`开机成功，距离上次关机${Bot.getTimeDiff(temp.stop_time)}`)
+  }
+}
 
 export class Restart extends plugin {
-  constructor (e = "") {
+  constructor(e) {
     super({
-      name: "重启",
-      dsc: "#重启",
+      name: "进程管理",
+      dsc: "#重启 #关机 #停止",
       event: "message",
       priority: 10,
       rule: [
@@ -15,87 +42,117 @@ export class Restart extends plugin {
           permission: "master"
         },
         {
-          reg: "^#(停机|关机)$",
+          reg: "^#关机$",
           fnc: "stop",
           permission: "master"
+        },
+        {
+          reg: "^#停(机|止)$",
+          fnc: "exit",
+          permission: "master"
         }
       ]
     })
-
     if (e) this.e = e
-    this.key = "Yz:restart"
   }
+  key = "Yz:restart"
 
   init() {
     Bot.once("online", () => this.restartMsg())
-    if (cfg.bot.restart_time) {
-      this.e = {
-        logFnc: "[自动重启]" ,
-        reply: msg => Bot.sendMasterMsg(msg),
-      }
-      setTimeout(() => this.restart(), cfg.bot.restart_time*60000)
+    this.e = {
+      reply: msg => Bot.sendMasterMsg(msg),
+      isMaster: true,
     }
+    if (cfg.bot.restart_time)
+      setTimeout(() => this.restart(), cfg.bot.restart_time*60000)
+
+    this.task = []
+    if (cfg.bot.restart_cron)
+      for (const i of Array.isArray(cfg.bot.restart_cron) ? cfg.bot.restart_cron : [cfg.bot.restart_cron])
+        this.task.push({
+          name: "定时重启",
+          cron: i,
+          fnc: () => this.restart(),
+        })
+    if (cfg.bot.stop_cron)
+      for (const i of Array.isArray(cfg.bot.stop_cron) ? cfg.bot.stop_cron : [cfg.bot.stop_cron])
+        this.task.push({
+          name: "定时关机",
+          cron: i,
+          fnc: () => this.stop(),
+        })
+    if (cfg.bot.start_cron)
+      for (const i of Array.isArray(cfg.bot.start_cron) ? cfg.bot.start_cron : [cfg.bot.start_cron])
+        this.task.push({
+          name: "定时开机",
+          cron: i,
+          fnc: () => new Start(this.e).start(),
+        })
   }
 
   async restartMsg() {
     let restart = await redis.get(this.key)
     if (!restart) return
+    await redis.del(this.key)
     restart = JSON.parse(restart)
-    const time = (Date.now() - (restart.time || Date.now()))/1000
-    const msg = []
-    if (restart.msg_id)
-      msg.push(segment.reply(restart.msg_id))
     if (restart.isStop)
-      msg.push(`开机成功，距离上次关机${time}秒`)
-    else
-      msg.push(`重启成功，用时${time}秒`)
+      return this.stop(restart.time)
 
-    if (restart.id) {
-      if (restart.isGroup)
-        Bot.sendGroupMsg(restart.bot_id, restart.id, msg)
-      else
-        Bot.sendFriendMsg(restart.bot_id, restart.id, msg)
-    } else {
-      Bot.sendMasterMsg(msg)
-    }
-    redis.del(this.key)
+    const time = Bot.getTimeDiff(restart.time)
+    const msg = [restart.isExit ? `开机成功，距离上次停止${time}` : `重启成功，用时${time}`]
+    if (restart.msg_id)
+      msg.unshift(segment.reply(restart.msg_id))
+
+    if (restart.group_id)
+      await Bot.sendGroupMsg(restart.bot_id, restart.group_id, msg)
+    else if (restart.user_id)
+      await Bot.sendFriendMsg(restart.bot_id, restart.user_id, msg)
+    else
+      await Bot.sendMasterMsg(msg)
   }
 
-  async restart() {
-    await this.e.reply(`开始重启，本次运行时长：${Bot.getTimeDiff()}`)
-    await redis.set(this.key, JSON.stringify({
-      isGroup: !!this.e.isGroup,
-      id: this.e.isGroup ? this.e.group_id : this.e.user_id,
+  async set(isExit) {
+    if (temp.priority)
+      return redis.set(this.key, JSON.stringify({
+        isStop: true,
+        time: temp.stop_time,
+      }))
+    await this.reply(`开始${isExit ? "停止" : "重启"}，本次运行时长${Bot.getTimeDiff()}`)
+    return redis.set(this.key, JSON.stringify({
+      isExit,
+      group_id: this.e.group_id,
+      user_id: this.e.user_id,
       bot_id: this.e.self_id,
       msg_id: this.e.message_id,
       time: Date.now(),
     }))
+  }
 
-    if (process.env.app_type == "pm2") {
+  async restart() {
+    await this.set()
+    if (process.env.app_type === "pm2") {
       const ret = await Bot.exec("pnpm run restart")
       if (!ret.error) process.exit()
-      await this.e.reply(`重启错误\n${ret.error}`)
+      await this.reply(`重启错误\n${ret.error}\n${ret.stdout}\n${ret.stderr}`)
       Bot.makeLog("error", ["重启错误", ret])
-    }
-    process.exit()
+    } else process.exit()
   }
 
-  async stop() {
-    await this.e.reply(`开始关机，本次运行时长：${Bot.getTimeDiff()}`)
-    await redis.set(this.key, JSON.stringify({
-      isStop: true,
-      isGroup: !!this.e.isGroup,
-      id: this.e.isGroup ? this.e.group_id : this.e.user_id,
-      bot_id: this.e.self_id,
-      msg_id: this.e.message_id,
-      time: Date.now(),
-    }))
+  async stop(time) {
+    if (temp.priority) return false
+    temp.priority = PluginsLoader.priority
+    PluginsLoader.priority = [{ class: Start }]
+    if (typeof time === "number") return temp.stop_time = time
+    temp.stop_time = Date.now()
+    return this.reply(`关机成功，本次运行时长${Bot.getTimeDiff(temp.start_time)}`)
+  }
 
-    if (process.env.app_type == "pm2") {
+  async exit() {
+    await this.set(true)
+    if (process.env.app_type === "pm2") {
       const ret = await Bot.exec("pnpm stop")
-      await this.e.reply(`关机错误\n${ret.error}\n${ret.stdout}\n${ret.stderr}`)
-      Bot.makeLog("error", ["关机错误", ret])
-    }
-    process.exit(1)
+      await this.reply(`停止错误\n${ret.error}\n${ret.stdout}\n${ret.stderr}`)
+      Bot.makeLog("error", ["停止错误", ret])
+    } else process.exit(1)
   }
 }

Yunzai/plugins/other/sendLog.js

@@ -50,7 +50,7 @@ export class sendLog extends plugin {
   }
 
   async getLog(logFile) {
-    let log = await fs.readFile(logFile, "utf-8")
+    let log = await fs.readFile(logFile, "utf8")
     log = log.split("\n")
 
     if (this.keyWord) {

Yunzai/plugins/other/update.js

@@ -1,47 +1,62 @@
-import cfg from '../../lib/config/config.js'
-import lodash from 'lodash'
-import fs from 'node:fs/promises'
-import { Restart } from './restart.js'
+import cfg from "../../lib/config/config.js"
+import fs from "node:fs/promises"
+import { Restart } from "./restart.js"
 
 let uping = false
 
 export class update extends plugin {
   constructor() {
     super({
-      name: '更新',
-      dsc: '#更新 #强制更新',
-      event: 'message',
+      name: "更新",
+      dsc: "#更新 #强制更新",
+      event: "message",
       priority: 4000,
       rule: [
         {
-          reg: '^#更新日志',
-          fnc: 'updateLog'
+          reg: "^#更新日志",
+          fnc: "updateLog"
         },
         {
-          reg: '^#(强制)?更新',
-          fnc: 'update'
+          reg: "^#(安?静)?(强制)?更新",
+          fnc: "update"
         },
         {
-          reg: '^#全部(强制)?更新$',
-          fnc: 'updateAll',
-          permission: 'master'
+          reg: "^#全部(安?静)?(强制)?更新$",
+          fnc: "updateAll",
+          permission: "master"
         }
       ]
     })
+    this.typeName = "TRSS-Yunzai"
+  }
+
+  get quiet() {
+    return /^#(全部)?(安?静)/.test(this.e.msg)
+  }
 
-    this.typeName = 'TRSS-Yunzai'
+  exec(cmd, plugin, opts = {}) {
+    if (plugin) opts.cwd = `plugins/${plugin}`
+    return Bot.exec(cmd, opts)
   }
 
   init() {
-    if (cfg.bot.update_time) {
-      this.e = {
-        isMaster: true,
-        logFnc: "[自动更新]",
-        msg: "#全部更新",
-        reply: msg => Bot.sendMasterMsg(msg),
-      }
-      this.autoUpdate()
+    this.e = {
+      isMaster: true,
+      logFnc: "[自动更新]",
+      msg: "#全部静更新",
+      reply: msg => Bot.sendMasterMsg(msg),
     }
+    if (cfg.bot.update_time)
+      this.autoUpdate()
+
+    this.task = []
+    if (cfg.bot.update_cron)
+      for (const i of Array.isArray(cfg.bot.update_cron) ? cfg.bot.update_cron : [cfg.bot.update_cron])
+        this.task.push({
+          name: "定时更新",
+          cron: i,
+          fnc: () => this.updateAll(),
+        })
   }
 
   autoUpdate() {
@@ -53,65 +68,58 @@ export class update extends plugin {
 
   async update() {
     if (!this.e.isMaster) return false
-    if (uping) return this.reply('已有命令更新中..请勿重复操作')
-
-    if (/详细|详情|面板|面版/.test(this.e.msg)) return false
+    if (uping) {
+      await this.reply("正在更新，请稍候再试")
+      return false
+    }
 
     /** 获取插件 */
-    let plugin = await this.getPlugin()
+    const plugin = await this.getPlugin()
     if (plugin === false) return false
 
+    uping = true
     await this.runUpdate(plugin)
 
-    if (this.isPkgUp)
-      await Bot.exec("pnpm install")
-    if (this.isUp)
-      this.restart()
+    if (this.isPkgUp) await this.updatePackage()
+    if (this.isUp) this.restart()
+    uping = false
   }
 
-  async getPlugin(plugin = '') {
-    if (!plugin) {
-      plugin = this.e.msg.replace(/#(强制)?更新(日志)?/, '')
-      if (!plugin) return ''
-    }
-
-    if (!await Bot.fsStat(`plugins/${plugin}/.git`)) return false
-
-    this.typeName = plugin
-    return plugin
+  async getPlugin(plugin = this.e.msg.replace(/#(安?静)?(强制)?更新(日志)?/, "")) {
+    if (!plugin) return ""
+    for (const i of [plugin, `${plugin}-Plugin`, `${plugin}-plugin`])
+      if (await Bot.fsStat(`plugins/${i}/.git`)) {
+        this.typeName = i
+        return i
+      }
+    return false
   }
 
-  async runUpdate(plugin = '') {
-    this.isNowUp = false
-
-    let cm = 'git pull --no-rebase'
+  async runUpdate(plugin = "") {
+    let cm = "git pull"
+    let type = "更新"
+    if (!plugin) cm = `git checkout package.json && ${cm}`
 
-    let type = '更新'
-    if (this.e.msg.includes('强制')) {
-      type = '强制更新'
-      cm = `git reset --hard && git pull --rebase --allow-unrelated-histories`
+    if (this.e.msg.includes("强制")) {
+      type = "强制更新"
+      cm = `git reset --hard ${await this.getRemoteBranch(true, plugin)} && git pull --rebase`
     }
-    if (plugin) cm = `cd "plugins/${plugin}" && ${cm}`
-
-    this.oldCommitId = await this.getcommitId(plugin)
+    this.oldCommitId = await this.getCommitId(plugin)
 
-    logger.mark(`${this.e.logFnc} 开始${type}：${this.typeName}`)
+    logger.mark(`${this.e.logFnc} 开始${type} ${this.typeName}`)
+    if (!this.quiet)
+      await this.reply(`开始${type} ${this.typeName}`)
+    const ret = await this.exec(cm, plugin)
 
-    await this.reply(`开始${type} ${this.typeName}`)
-    uping = true
-    const ret = await Bot.exec(cm)
-    uping = false
-
-    ret.stdout = String(ret.stdout)
-    if (ret.error) {
-      logger.mark(`${this.e.logFnc} 更新失败：${this.typeName}`)
-      this.gitErr(Bot.String(ret.error), ret.stdout)
+    if (ret.error && !await this.gitErr(plugin, ret.stdout, ret.error.message)) {
+      logger.mark(`${this.e.logFnc} 更新失败 ${this.typeName}`)
       return false
     }
 
     const time = await this.getTime(plugin)
-    if (/Already up|已经是最新/g.test(ret.stdout)) {
-      await this.reply(`${this.typeName} 已是最新\n最后更新时间：${time}`)
+    if (/Already up|已经是最新/.test(ret.stdout)) {
+      if (!this.quiet)
+        await this.reply(`${this.typeName} 已是最新\n最后更新时间：${time}`)
     } else {
       this.isUp = true
       if (/package\.json/.test(ret.stdout))
@@ -124,100 +132,117 @@ export class update extends plugin {
     return true
   }
 
-  async getcommitId(plugin = '') {
-    let cm = 'git rev-parse --short HEAD'
-    if (plugin) cm = `cd "plugins/${plugin}" && ${cm}`
-    cm = await Bot.exec(cm)
-    return lodash.trim(String(cm.stdout))
+  async getCommitId(...args) {
+    return (await this.exec("git rev-parse --short HEAD", ...args)).stdout
   }
 
-  async getTime(plugin = '') {
-    let cm = 'git log -1 --pretty=%cd --date=format:"%F %T"'
-    if (plugin) cm = `cd "plugins/${plugin}" && ${cm}`
-    cm = await Bot.exec(cm)
-    return lodash.trim(String(cm.stdout))
+  async getTime(...args) {
+    return (await this.exec('git log -1 --pretty=%cd --date=format:"%F %T"', ...args)).stdout
   }
 
-  async gitErr(error, stdout) {
-    const msg = '更新失败！'
+  async getBranch(...args) {
+    return (await this.exec("git branch --show-current", ...args)).stdout
+  }
 
-    if (error.includes('Timed out')) {
-      const remote = error.match(/'(.+?)'/g)[0].replace(/'/g, '')
-      return this.reply(`${msg}\n连接超时：${remote}`)
-    }
+  async getRemote(branch, ...args) {
+    return (await this.exec(`git config branch.${branch}.remote`, ...args)).stdout
+  }
 
-    if (/Failed to connect|unable to access/g.test(error)) {
-      const remote = error.match(/'(.+?)'/g)[0].replace(/'/g, '')
-      return this.reply(`${msg}\n连接失败：${remote}`)
-    }
+  async getRemoteBranch(string, ...args) {
+    const branch = await this.getBranch(...args)
+    if (!branch && string) return ""
+    const remote = await this.getRemote(branch, ...args)
+    if (!remote && string) return ""
+    return string ? `${remote}/${branch}` : { remote, branch }
+  }
 
-    if (error.includes('be overwritten by merge')) {
-      return this.reply(`${msg}\n存在冲突：\n${error}\n请解决冲突后再更新，或者执行#强制更新，放弃本地修改`)
+  async getRemoteUrl(branch, hide, ...args) {
+    if (branch) {
+      const url = (await this.exec(`git config remote.${branch}.url`, ...args)).stdout
+      return hide ? url.replace(/\/\/([^@]+)@/, "//") : url
     }
 
-    if (stdout.includes('CONFLICT')) {
-      return this.reply(`${msg}\n存在冲突：\n${error}${stdout}\n请解决冲突后再更新，或者执行#强制更新，放弃本地修改`)
+    const ret = await this.exec("git config -l", ...args)
+    const urls = {}
+    for (const i of ret.stdout.match(/remote\..*?\.url=.+/g) || []) {
+      const branch = i.replace(/remote\.(.*?)\.url=.+/g, "$1")
+      const url = i.replace(/remote\..*?\.url=/g, "")
+      urls[branch] = (hide ? url.replace(/\/\/([^@]+)@/, "//") : url)
     }
+    return urls
+  }
 
-    return this.reply([error, stdout])
+  gitErrUrl(error) {
+    return error.match(/'(.+?)'/g)[0].replace(/'(.+?)'/, "$1")
+  }
+
+  async gitErr(plugin, stdout, error) {
+    if (/unable to access|无法访问/.test(error))
+      await this.reply(`远程仓库连接错误：${this.gitErrUrl(error)}`)
+    else if (/not found|未找到|does not (exist|appear)|不存在|Authentication failed|鉴权失败/.test(error))
+      await this.reply(`远程仓库地址错误：${this.gitErrUrl(error)}`)
+    else if (/be overwritten by merge|被合并操作覆盖/.test(error) || /Merge conflict|合并冲突/.test(stdout))
+      await this.reply(`${error}\n${stdout}\n若修改过文件请手动更新，否则发送 #强制更新${plugin}`)
+    else if (/divergent branches|偏离的分支/.test(error)) {
+      const ret = await this.exec("git pull --rebase", plugin)
+      if (!ret.error && /Successfully rebased|成功变基/.test(ret.stdout+ret.stderr))
+        return true
+      await this.reply(`${error}\n${stdout}\n若修改过文件请手动更新，否则发送 #强制更新${plugin}`)
+    } else await this.reply(`${error}\n${stdout}\n未知错误，可尝试发送 #强制更新${plugin}`)
   }
 
   async updateAll() {
-    const dirs = await fs.readdir('./plugins/')
+    if (uping) {
+      await this.reply("正在更新，请稍候再试")
+      return false
+    }
 
+    uping = true
     await this.runUpdate()
-
-    for (let plu of dirs) {
-      plu = await this.getPlugin(plu)
-      if (plu === false) continue
-      await this.runUpdate(plu)
+    for (let plugin of await fs.readdir("plugins")) {
+      plugin = await this.getPlugin(plugin)
+      if (plugin === false) continue
+      await this.runUpdate(plugin)
     }
 
-    if (this.isPkgUp)
-      await Bot.exec("pnpm install")
-    if (this.isUp)
-      this.restart()
+    if (this.isPkgUp) await this.updatePackage()
+    if (this.isUp) this.restart()
+    uping = false
+  }
+
+  async updatePackage() {
+    const cmd = "pnpm install"
+    if (process.platform === "win32")
+      return this.reply(`检测到依赖更新，请 #关机 后执行 ${cmd}`)
+    await this.reply("开始更新依赖")
+    return this.exec(cmd)
   }
 
   restart() {
     new Restart(this.e).restart()
   }
 
-  async getLog(plugin = '') {
-    let cm = 'git log -100 --pretty="%h||[%cd] %s" --date=format:"%F %T"'
-    if (plugin) cm = `cd "plugins/${plugin}" && ${cm}`
-
-    cm = await Bot.exec(cm)
-    if (cm.error) {
-      logger.error(cm.error)
-      await this.reply(String(cm.error))
-    }
-    const logAll = String(cm.stdout).trim().split('\n')
+  async getLog(plugin = "") {
+    let cm = await this.exec('git log -100 --pretty="%h||[%cd] %s" --date=format:"%F %T"', plugin)
+    if (cm.error) return this.reply(cm.error.message)
 
+    const logAll = cm.stdout.split("\n")
     if (!logAll.length) return false
 
     let log = []
     for (let str of logAll) {
-      str = str.split('||')
-      if (str[0] == this.oldCommitId) break
-      if (str[1].includes('Merge branch')) continue
+      str = str.split("||")
+      if (str[0] === this.oldCommitId) break
+      if (str[1].includes("Merge branch")) continue
       log.push(str[1])
     }
-    let line = log.length
-    log = log.join('\n\n')
-
-    if (log.length <= 0) return ''
-
-    cm = 'git config -l'
-    if (plugin) cm = `cd "plugins/${plugin}" && ${cm}`
-    cm = await Bot.exec(cm)
-    const end = String(cm.stdout).match(/remote\..*\.url=.+/g).join('\n\n').replace(/remote\..*\.url=/g, '').replace(/\/\/([^@]+)@/, '//')
-    if (cm.error) {
-      logger.error(cm.error)
-      await this.reply(String(cm.error))
-    }
+    if (log.length <= 0) return ""
+
+    const msg = [`${plugin || "TRSS-Yunzai"} 更新日志，共${log.length}条`, log.join("\n\n")]
+    const end = await this.getRemoteUrl((await this.getRemoteBranch(false, plugin)).remote, true, plugin)
+    if (end) msg.push(end)
 
-    return Bot.makeForwardArray([`${plugin || 'TRSS-Yunzai'} 更新日志，共${line}条`, log, end])
+    return Bot.makeForwardArray(msg)
   }
 
   async updateLog() {
@@ -225,4 +250,4 @@ export class update extends plugin {
     if (plugin === false) return false
     return this.reply(await this.getLog(plugin))
   }
-}
+}

Yunzai/plugins/other/version.js

@@ -3,7 +3,7 @@ try {
   App = (await import("#miao")).App
   Common = (await import("#miao")).Common
   Version = (await import("#miao")).Version
-} catch (err) {}
+} catch {}
 
 export let version = {}
 if (App) {

Yunzai/plugins/system/master.js

@@ -1,5 +1,5 @@
 import fs from "node:fs/promises"
-import { randomUUID } from "node:crypto"
+import { ulid } from "ulid"
 let code = {}
 let file = "config/config/other.yaml"
 export class master extends plugin {
@@ -35,18 +35,18 @@ export class master extends plugin {
       return false
     }
 
-    code[this.e.user_id] = randomUUID()
-    logger.mark(`${logger.cyan(`[${this.e.user_id}]`)} 设置主人验证码：${logger.green(code[this.e.user_id])}`)
+    code[this.e.user_id] = ulid()
+    logger.mark(`${logger.cyan(`[${this.e.user_id}]`)} 设置主人验证码 ${logger.green(code[this.e.user_id])}`)
     this.setContext("verify")
     await this.reply(`[${this.e.user_id}] 请输入验证码`, true)
   }
 
   async verify() {
     this.finish("verify")
-    if (this.e.msg.trim() == code[this.e.user_id]) {
+    if (this.e.msg.trim().toUpperCase() == code[this.e.user_id]) {
       await this.edit(file, "masterQQ", this.e.user_id)
       await this.edit(file, "master", `${this.e.self_id}:${this.e.user_id}`)
-      await this.reply(`[${this.e.user_id}] 设置主人成功`, true)
+      await this.reply(`[${this.e.user_id}] 设置主人完成`, true)
     } else {
       await this.reply("验证码错误", true)
       return false

Yunzai/plugins/system/status.js

@@ -37,7 +37,7 @@ export class status extends plugin {
     let msg = "\n\n账号在线时长"
     for (const i of Bot.uin)
       if (Bot[i]?.stat?.start_time)
-        msg += `\n${Bot.getTimeDiff(Bot[i].stat.start_time)} ${i}`
+        msg += `\n${Bot.getTimeDiff(Bot[i].stat.start_time*1000)} ${i}`
     return msg
   }
 

Yunzai/renderers/puppeteer/config_default.yaml

@@ -21,3 +21,8 @@ args:
 
 # puppeteer截图超时时间
 puppeteerTimeout:
+
+# 页面goto时的参数
+pageGotoParams:
+  timeout: 120000
+  waitUntil: networkidle2

Yunzai/renderers/puppeteer/lib/puppeteer.js

@@ -40,6 +40,10 @@ export default class Puppeteer extends Renderer {
       this.config.wsEndpoint = config.puppeteerWS || cfg?.bot?.puppeteer_ws
     /** puppeteer超时超时时间 */
     this.puppeteerTimeout = config.puppeteerTimeout || cfg?.bot?.puppeteer_timeout || 0
+    this.pageGotoParams = config.pageGotoParams || {
+      timeout: 120000,
+      waitUntil: "networkidle2",
+    }
   }
 
   /**
@@ -74,7 +78,7 @@ export default class Puppeteer extends Renderer {
           await redis.del(this.browserMacKey)
         }
       }
-    } catch (err) {}
+    } catch {}
 
     if (!this.browser || !connectFlag) {
       // 如果没有实例，初始化puppeteer
@@ -159,11 +163,11 @@ export default class Puppeteer extends Renderer {
       return false
     const pageHeight = data.multiPageHeight || 4000
 
-    let savePath = this.dealTpl(name, data)
+    const savePath = this.dealTpl(name, data)
     if (!savePath) return false
 
     let buff = ""
-    let start = Date.now()
+    const start = Date.now()
 
     let ret = []
     this.shoting.push(name)
@@ -183,20 +187,20 @@ export default class Puppeteer extends Renderer {
 
     try {
       const page = await this.browser.newPage()
-      let pageGotoParams = lodash.extend({ timeout: 120000 }, data.pageGotoParams || {})
+      const pageGotoParams = lodash.extend(this.pageGotoParams, data.pageGotoParams || {})
       await page.goto(`file://${_path}${lodash.trim(savePath, ".")}`, pageGotoParams)
-      let body = await page.$("#container") || await page.$("body")
+      const body = await page.$("#container") || await page.$("body")
 
       // 计算页面高度
       const boundingBox = await body.boundingBox()
       // 分页数
       let num = 1
 
-      let randData = {
+      const randData = {
         type: data.imgType || "jpeg",
         omitBackground: data.omitBackground || false,
         quality: data.quality || 90,
-        path: data.path || ""
+        path: data.path || "",
       }
 
       if (data.multiPage) {
@@ -204,9 +208,8 @@ export default class Puppeteer extends Renderer {
         num = Math.round(boundingBox.height / pageHeight) || 1
       }
 
-      if (data.imgType === "png") {
+      if (data.imgType === "png")
         delete randData.quality
-      }
 
       if (!data.multiPage) {
         buff = await body.screenshot(randData)