node-karin 0.8.14 → 0.10.0

package/config/defSet/config.yaml

@@ -40,7 +40,8 @@ ffmpeg_path:
 ffprobe_path:
 
 # 主人列表 主权限
-master: []
+master:
+  - input
 
 # 管理员列表 子权限
 admin: []

package/lib/adapter/onebot/11/index.d.ts

@@ -384,6 +384,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
         uid: string;
         uin: string;
         nick: string;
+        role: Role;
         age: number;
         unique_title: string;
         unique_title_expire_time: number;
@@ -406,6 +407,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
         uid: string;
         uin: string;
         nick: string;
+        role: Role;
         age: number;
         unique_title: string;
         unique_title_expire_time: number;

package/lib/adapter/onebot/11/index.js

@@ -697,6 +697,7 @@ export class AdapterOneBot11 {
             uid: target_uid_or_uin,
             uin: target_uid_or_uin,
             nick: info.nickname,
+            role: info.role,
             age: info.age,
             unique_title: info.title,
             unique_title_expire_time: info.title_expire_time,
@@ -724,6 +725,7 @@ export class AdapterOneBot11 {
                 uid: user_id,
                 uin: user_id,
                 nick: v.nickname,
+                role: v.role,
                 age: v.age,
                 unique_title: v.title,
                 unique_title_expire_time: v.title_expire_time,

package/lib/event/review.handler.js

@@ -64,6 +64,7 @@ export const review = new (class Handler {
     /** 同时启用 */
     if (this.App.WhiteList.groups && this.App.BlackList.groups) {
       this.GroupEnable = e => {
+        if (!e.group_id) { return false }
         /** 白名单不为空 */
         if (Array.isArray(this.Config.WhiteList.groups) && this.Config.WhiteList.groups.length) {
           return this.Config.WhiteList.groups.includes(String(e.group_id))

package/lib/render/client.js

@@ -2,7 +2,7 @@ import fs from 'fs'
 import WebSocket from 'ws'
 import { render } from './app.js'
 import { RenderBase } from './base.js'
-import { randomUUID } from 'crypto'
+import { createHash, randomUUID } from 'crypto'
 import { listener } from '../core/index.js'
 import { common, logger } from '../utils/index.js'
 export class RenderClient extends RenderBase {
@@ -94,12 +94,20 @@ export class RenderClient extends RenderBase {
         const filePath = decodeURIComponent(data.params.file)
         logger.debug(`[渲染器:${this.id}][正向WS] 访问静态文件：${filePath}`)
         const file = fs.readFileSync('.' + filePath)
-        const params = {
-          echo: data.echo,
-          action: 'static',
-          status: 'ok',
-          data: { file },
-        }
+        const md5 = createHash('md5').update(file).digest('hex')
+        const params = data.params.md5?.includes(md5)
+          ? {
+              echo: data.echo,
+              action: 'static',
+              status: 'ok',
+              data: { verifiedMd5: md5 },
+            }
+          : {
+              echo: data.echo,
+              action: 'static',
+              status: 'ok',
+              data: { file },
+            }
         return this.ws.send(JSON.stringify(params))
       }
       /** 渲染结果 */

package/lib/render/client_even.d.ts

@@ -0,0 +1,30 @@
+import WebSocket from 'ws';
+import { RenderBase } from './base.js';
+import { KarinRenderType, RenderResult } from '../types/render.js';
+export declare class RenderClientEven extends RenderBase {
+    url: string;
+    type: string;
+    id: string;
+    index: number;
+    retry: number;
+    reg: RegExp;
+    ws: WebSocket;
+    constructor(url: string);
+    /**
+     * 初始化
+     */
+    start(): Promise<void>;
+    /**
+     * 创建连接
+     */
+    link(): Promise<void>;
+    /**
+     * 接受消息
+     */
+    message(str: string): Promise<void>;
+    /**
+     * 渲染标准方法
+     * @param options 渲染参数
+     */
+    render<T extends KarinRenderType>(options: T): Promise<RenderResult<T>>;
+}

package/lib/render/client_even.js

@@ -0,0 +1,163 @@
+import fs from 'fs'
+import axios from 'axios'
+import WebSocket from 'ws'
+import { render } from './app.js'
+import { RenderBase } from './base.js'
+import { createHash, randomUUID } from 'crypto'
+import { listener } from '../core/index.js'
+import { logger } from '../utils/index.js'
+export class RenderClientEven extends RenderBase {
+  url
+  type
+  id
+  index
+  retry
+  reg
+  ws
+  constructor (url) {
+    super()
+    this.url = url
+    this.type = 'image'
+    this.id = 'puppeteer'
+    this.index = 0
+    this.retry = 0
+    this.reg = new RegExp(`(${process.cwd().replace(/\\/g, '\\\\')}|${process.cwd().replace(/\\/g, '/')})`, 'g')
+  }
+
+  /**
+     * 初始化
+     */
+  async start () {
+    try {
+      const response = await axios.head(this.url)
+      if (response.status === 200) {
+        logger.mark(`[渲染器:${this.id}][WebSocket] 注册渲染器：${logger.green(this.url)}`)
+        try {
+          this.index = render.app({ id: this.id, type: this.type, render: this.render.bind(this) })
+        } catch (error) {
+          logger.error(`[渲染器:${this.id}] 注册渲染器失败：`, error)
+        }
+      } else {
+        logger.error(`[渲染器:${this.id}] 注册渲染器失败：渲染器发生错误`)
+      }
+    } catch (error) {
+      logger.error(`[渲染器:${this.id}] 注册渲染器失败：`, error)
+    }
+  }
+
+  /**
+     * 创建连接
+     */
+  async link () {
+    return new Promise((resolve, reject) => {
+      if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+        return resolve()
+      }
+      /** 连接ws */
+      this.ws = new WebSocket(this.url)
+      /** 建立连接 */
+      this.ws.on('open', () => {
+        logger.mark(`[渲染器:${this.id}][WebSocket] 建立连接：${logger.green(this.url)}`)
+        /** 监听消息 */
+        this.ws.on('message', data => this.message(data.toString()))
+        resolve()
+      })
+      /** 监听断开 */
+      this.ws.once('close', async () => {
+        /** 停止监听 */
+        this.ws.removeAllListeners()
+      })
+      /** 监听错误 */
+      this.ws.on('error', async (e) => {
+        this.ws.close()
+      })
+    })
+  }
+
+  /**
+     * 接受消息
+     */
+  async message (str) {
+    const data = JSON.parse(str)
+    switch (data.action) {
+      /** 静态文件 */
+      case 'static': {
+        const filePath = decodeURIComponent(data.params.file)
+        logger.debug(`[渲染器:${this.id}][正向WS] 访问静态文件：${filePath}`)
+        const file = fs.readFileSync('.' + filePath)
+        const md5 = createHash('md5').update(file).digest('hex')
+        const params = data.params.md5?.includes(md5)
+          ? {
+              echo: data.echo,
+              action: 'static',
+              status: 'ok',
+              data: { verifiedMd5: md5 },
+            }
+          : {
+              echo: data.echo,
+              action: 'static',
+              status: 'ok',
+              data: { file },
+            }
+        return this.ws.send(JSON.stringify(params))
+      }
+      /** 渲染结果 */
+      case 'renderRes': {
+        listener.emit(data.echo, data)
+        break
+      }
+      /** 超时 */
+      case 'timeout': {
+        logger.debug(`[渲染器:${this.id}][正向WS] 处理超时`)
+        break
+      }
+      /** 未知数据 */
+      default: {
+        logger.warn(`[渲染器:${this.id}] 收到未知数据：`, data)
+      }
+    }
+  }
+
+  /**
+     * 渲染标准方法
+     * @param options 渲染参数
+     */
+  async render (options) {
+    /** 渲染模板 */
+    let file = options.file
+    let action = 'renderHtml'
+    if (options.file.includes('http') || options.vue) {
+      action = 'render'
+    } else {
+      file = this.dealTpl(options)
+      /** 判断是本地karin-puppeteer还是远程 */
+      if (!/127\.0\.0\.1|localhost/.test(this.url)) {
+        file = fs.readFileSync(file, 'utf-8').replace(this.reg, '')
+      } else {
+        action = 'render'
+        file = 'file://' + file
+      }
+    }
+    if (!file) {
+      logger.error(`[渲染器:${this.id}:${this.index}] 渲染文件不存在：${options.file}`)
+      return ''
+    }
+    /** 编码 */
+    file = encodeURIComponent(file)
+    const data = options
+    const echo = randomUUID()
+    /** 移除掉模板参数 */
+    if (data.data) { delete data.data }
+    data.file = file
+    const req = JSON.stringify({ echo, action, data })
+    logger.debug(`[渲染器:${this.id}:${this.index}][正向WS] 请求：${this.url} \nhtml: ${options.file} \ndata: ${JSON.stringify(data)}`)
+    await this.link()
+    this.ws.send(req)
+    return new Promise((resolve, reject) => {
+      listener.once(echo, (data) => {
+        if (data.ok) { return resolve(data.data) }
+        reject(new Error(JSON.stringify(data)))
+      })
+    })
+  }
+}

package/lib/types/adapter/api.d.ts

@@ -1,4 +1,4 @@
-import { Contact, KarinElement, Sender } from '../index.js';
+import { Contact, KarinElement, Role, Sender } from '../index.js';
 /**
  * - 基本消息结构
  */
@@ -211,6 +211,10 @@ export interface GroupMemberInfo {
      * - 用户UIN
      */
     uin: string;
+    /**
+     * - 用户角色
+     */
+    role: Role;
     /**
      * - 用户昵称
      */

package/lib/utils/common.d.ts

@@ -102,28 +102,29 @@ declare class Common {
     /**
      * 将文件转换为不带前缀的base64字符串
      * @param file - 文件路径或Buffer对象、可读流对象、http地址、base64://字符串
-     * @param - 附加数据
-     * @param - 为true时，http地址会直接返回，否则会下载文件并转换为base64字符串
+     * @param options - 选项 http为true时返回http地址
      * @returns 返回base64字符串
      */
-    base64(file: any, options?: {
+    base64(file: string | Buffer | Readable, options?: {
         http: boolean;
     }): Promise<string>;
+    /**
+     * 将文件转换为Buffer对象 仅支持标准格式
+     * @param file - 文件路径或Buffer对象、可读流对象、http地址、base64://字符串
+     * @param options - 选项 http为true时返回http地址
+     * @returns - 返回Buffer对象
+     */
+    buffer<T extends {
+        http: boolean;
+    }>(file: string | Buffer | Readable, options?: T): Promise<T extends {
+        http: true;
+    } ? string : Buffer>;
     /**
      * 将数据流对象转换为Buffer对象
      * @param {stream.Readable} stream - 要转换的数据流对象
      * @returns {Promise<Buffer>} - 返回Buffer
      */
     stream(stream: Readable): Promise<Buffer>;
-    /**
-     * 将文件转换为Buffer对象
-     * @param file - 文件路径或Buffer对象、可读流对象、http地址、base64://字符串
-     * @param options - 选项
-     * @returns - 返回Buffer对象
-     */
-    buffer(file: any, options?: {
-        http: boolean;
-    }): Promise<Buffer | Error | string>;
     /**
      * 标准化发送的消息内容
      * @param elements - 消息内容

package/lib/utils/common.js

@@ -33,12 +33,12 @@ class Common {
   async downFile (fileUrl, savePath, param = {}) {
     try {
       this.mkdir(path.dirname(savePath))
-      logger && logger.info(`[下载文件] ${fileUrl}`)
+      logger.info(`[下载文件] ${fileUrl}`)
       const response = await axios.get(fileUrl, { ...param, responseType: 'stream' })
       await this.streamPipeline(response.data, fs.createWriteStream(savePath))
       return true
     } catch (err) {
-      logger && logger.error(`下载文件错误：${err}`)
+      logger.error(`下载文件错误：${err}`)
       return false
     }
   }
@@ -242,49 +242,59 @@ class Common {
   /**
      * 将文件转换为不带前缀的base64字符串
      * @param file - 文件路径或Buffer对象、可读流对象、http地址、base64://字符串
-     * @param - 附加数据
-     * @param - 为true时，http地址会直接返回，否则会下载文件并转换为base64字符串
+     * @param options - 选项 http为true时返回http地址
      * @returns 返回base64字符串
      */
   async base64 (file, options = { http: false }) {
-    /** 先判断是否非字符串情况 */
+    /** 非字符串 */
     if (typeof file !== 'string') {
-      /** buffer */
-      if (Buffer.isBuffer(file)) {
-        return file.toString('base64')
-      }
-      /** 可读流 */
-      if (file instanceof Readable) {
-        const data_1 = await this.stream(file)
-        return data_1.toString('base64')
-      }
-      /** 未知类型 */
-      throw new Error('未知类型')
+      if (Buffer.isBuffer(file)) { return file.toString('base64') }
+      if (file instanceof Readable) { return (await this.stream(file)).toString('base64') }
+      return file
     }
     /** base64:// */
-    if (file.startsWith('base64://')) {
-      return file.replace('base64://', '')
-    }
-    /** url */
-    if (file.startsWith('http://') || file.startsWith('https://')) {
+    if (file.startsWith('base64://')) { return file.replace('base64://', '') }
+    /** http */
+    if (file.startsWith('http')) {
       if (options.http) { return file }
       const response = await axios.get(file, { responseType: 'arraybuffer' })
       return Buffer.from(response.data, 'binary').toString('base64')
     }
-    /** file:/// */
-    if (fs.existsSync(file.replace(/^file:\/\/\//, ''))) {
-      file = file.replace(/^file:\/\/\//, '')
-      return fs.readFileSync(file).toString('base64')
-    }
     /** file:// */
-    if (fs.existsSync(file.replace(/^file:\/\//, ''))) {
-      file = file.replace(/^file:\/\//, '')
-      return fs.readFileSync(file).toString('base64')
+    const files = file.replace(/^file:\/\//, '')
+    if (fs.existsSync(files)) { return fs.readFileSync(file).toString('base64') }
+    /** 无前缀base64:// */
+    return Buffer.from(file, 'base64').toString('base64')
+  }
+
+  /**
+     * 将文件转换为Buffer对象 仅支持标准格式
+     * @param file - 文件路径或Buffer对象、可读流对象、http地址、base64://字符串
+     * @param options - 选项 http为true时返回http地址
+     * @returns - 返回Buffer对象
+     */
+  async buffer (file, options) {
+    /** 非字符串 */
+    if (typeof file !== 'string') {
+      if (Buffer.isBuffer(file)) { return file }
+      if (file instanceof Readable) { return await this.stream(file) }
+      return file
+    }
+    /** base64 */
+    if (file.startsWith('base64://')) {
+      return Buffer.from(file.replace('base64://', ''), 'base64')
+    }
+    /** http */
+    if (file.startsWith('http')) {
+      if (options?.http) { return file }
+      const response = await axios.get(file, { responseType: 'arraybuffer' })
+      return Buffer.from(response.data)
     }
+    /** file:// */
+    const files = file.replace(/^file:\/\//, '')
+    if (fs.existsSync(files)) { return fs.readFileSync(files) }
     /** 无前缀base64:// */
-    const buffer = Buffer.from(file, 'base64').toString('base64') === file
-    if (buffer) { return file }
-    throw new Error('未知类型')
+    return Buffer.from(file, 'base64')
   }
 
   /**
@@ -301,40 +311,6 @@ class Common {
     })
   }
 
-  /**
-     * 将文件转换为Buffer对象
-     * @param file - 文件路径或Buffer对象、可读流对象、http地址、base64://字符串
-     * @param options - 选项
-     * @returns - 返回Buffer对象
-     */
-  async buffer (file, options = { http: false }) {
-    if (typeof file !== 'string') {
-      if (Buffer.isBuffer(file)) { return file }
-      if (file instanceof Readable) { return this.stream(file) }
-      throw new Error('未知文件类型：' + file)
-    }
-    if (file.startsWith('base64://')) { return Buffer.from(file.replace('base64://', ''), 'base64') }
-    if (file.startsWith('http://') || file.startsWith('https://')) {
-      if (options.http) { return file }
-      const response = await axios.get(file, { responseType: 'arraybuffer' })
-      return Buffer.from(response.data)
-    }
-    /** file:/// */
-    if (fs.existsSync(file.replace(/^file:\/\/\//, ''))) {
-      file = file.replace(/^file:\/\/\//, '')
-      return fs.readFileSync(file)
-    }
-    /** file:// */
-    if (fs.existsSync(file.replace(/^file:\/\//, ''))) {
-      file = file.replace(/^file:\/\//, '')
-      return fs.readFileSync(file)
-    }
-    /** 无前缀base64:// */
-    const buffer = Buffer.from(file, 'base64')
-    if (buffer.toString('base64') === file) { return buffer }
-    throw new Error('未知类型')
-  }
-
   /**
      * 标准化发送的消息内容
      * @param elements - 消息内容

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.8.14",
+  "version": "0.10.0",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",