node-karin 0.6.14 → 0.6.15

package/lib/adapter/input/index.d.ts

@@ -1,5 +1,5 @@
 import { KarinAdapter } from '../../types/adapter.js';
-import { contact, KarinElement } from '../../types/index.js';
+import { contact, KarinElement, LoggerLevel } from '../../types/index.js';
 /**
  * - 标准输入输出适配器
  */
@@ -14,7 +14,7 @@ export declare class AdapterInput implements KarinAdapter {
     get self_id(): string;
     stdin(): this;
     init(): void;
-    logger(level: 'info' | 'error' | 'trace' | 'debug' | 'mark' | 'warn' | 'fatal', ...args: any[]): void;
+    logger(level: LoggerLevel, ...args: any[]): void;
     GetVersion(): Promise<{
         name: string;
         app_name: string;

package/lib/adapter/input/index.js

@@ -72,7 +72,7 @@ export class AdapterInput {
             user_id: 'input',
             time: Date.now(),
             message_id: `input.${Date.now()}`,
-            message_seq: '',
+            message_seq: 0,
             sender: {
                 uid: 'input',
                 uin: 'input',

package/lib/adapter/kritor/grpc.js

@@ -80,7 +80,7 @@ export class KritorGrpc {
                                     user_id: sender.uid + '',
                                     time: kritorData.time,
                                     message_id: kritorData.message_id + '',
-                                    message_seq: kritorData.message_seq + '',
+                                    message_seq: Number(kritorData.message_seq),
                                     sender: {
                                         ...sender,
                                         uid: sender.uid + '',

package/lib/adapter/onebot/onebot11.d.ts

@@ -1,6 +1,6 @@
 import WebSocket from 'ws';
 import { IncomingMessage } from 'http';
-import { KarinAdapter } from '../../types/index.js';
+import { KarinAdapter, LoggerLevel } from '../../types/index.js';
 import { contact, OneBot11Api, KarinElement, OneBot11Segment, CustomNodeSegment, OneBot11ApiParamsType, GroupInfo, KarinNodeElement } from '../../types/index.js';
 /**
  * @class OneBot11
@@ -44,7 +44,7 @@ export declare class AdapterOneBot11 implements KarinAdapter {
     /**
      * 专属当前Bot的日志打印方法
      */
-    logger(level: 'info' | 'error' | 'trace' | 'debug' | 'mark' | 'warn' | 'fatal', ...args: any[]): void;
+    logger(level: LoggerLevel, ...args: any[]): void;
     /**
      * 获取头像url
      * @param 头像大小，默认`0`
@@ -277,14 +277,14 @@ export declare class AdapterOneBot11 implements KarinAdapter {
      * @param name - 文件名称 必须提供
      * @param folder - 父目录ID 不提供则上传到根目录
      */
-    UploadPrivateFile(group_id: string, file: string, name: string, folder?: string): Promise<any>;
+    UploadGroupFile(group_id: string, file: string, name: string, folder?: string): Promise<any>;
     /**
      * 上传私聊文件
      * @param user_id - 用户ID
      * @param file - 本地文件绝对路径
      * @param name - 文件名称 必须提供
      */
-    UploadGroupFile(user_id: string, file: string, name: string): Promise<any>;
+    UploadPrivateFile(user_id: string, file: string, name: string): Promise<any>;
     SetEssenceMessage(): Promise<void>;
     DeleteEssenceMessage(): Promise<void>;
     SetFriendApplyResult(): Promise<void>;

package/lib/adapter/onebot/onebot11.js

@@ -157,7 +157,7 @@ export class AdapterOneBot11 {
                     user_id: data.sender.user_id + '',
                     time: data.time,
                     message_id: data.message_id + '',
-                    message_seq: data.message_id + '',
+                    message_seq: data.message_id,
                     sender: {
                         ...data.sender,
                         uid: data.sender.user_id + '',
@@ -1223,7 +1223,7 @@ export class AdapterOneBot11 {
      * @param name - 文件名称 必须提供
      * @param folder - 父目录ID 不提供则上传到根目录
      */
-    async UploadPrivateFile(group_id, file, name, folder) {
+    async UploadGroupFile(group_id, file, name, folder) {
         return await this.SendApi('upload_group_file', { group_id, file, name, folder });
     }
     /**
@@ -1232,7 +1232,7 @@ export class AdapterOneBot11 {
      * @param file - 本地文件绝对路径
      * @param name - 文件名称 必须提供
      */
-    async UploadGroupFile(user_id, file, name) {
+    async UploadPrivateFile(user_id, file, name) {
         return await this.SendApi('upload_private_file', { user_id, file, name });
     }
     async SetEssenceMessage() { }

package/lib/core/plugin.d.ts

@@ -3,10 +3,6 @@ import { PluginType, KarinElement, KarinNodeElement, EventType, KarinNoticeEvent
  * 插件基类
  */
 export declare class Plugin implements PluginType {
-    e: EventType<this>;
-    init?: () => Promise<any>;
-    accept?: (e: any) => Promise<any>;
-    replyCallback: PluginType['replyCallback'];
     /**
      * @param name - 插件名称
      */
@@ -159,6 +155,8 @@ export declare class Plugin implements PluginType {
      * 清除上下文状态
      */
     finish(): void;
+    e: EventType<this>;
+    replyCallback: PluginType['replyCallback'];
 }
 /**
  * 上下文状态

package/lib/core/plugin.js

@@ -2,11 +2,6 @@
  * 插件基类
  */
 export class Plugin {
-  // 类型 需要根据e中的event类型来确定
-  e
-  init
-  accept
-  replyCallback
   /**
      * @param name - 插件名称
      */
@@ -136,6 +131,9 @@ export class Plugin {
       delete stateArr[key]
     }
   }
+
+  e
+  replyCallback
 }
 /**
  * 上下文状态

package/lib/core/plugin.loader.d.ts

@@ -85,7 +85,10 @@ declare class PluginLoader {
      * @param path - 插件路径
      * @param lang - 语言环境
      */
-    getIndex(path: string, lang: 'js' | 'ts'): string | boolean;
+    getIndex(path: string, dir: dirName, lang: 'js' | 'ts'): {
+        dir: dirName;
+        name: fileName;
+    } | false;
     /**
      * 获取指定文件夹下的所有插件
      * @param dir - 插件包名称

package/lib/core/plugin.loader.js

@@ -126,10 +126,10 @@ class PluginLoader {
       /** package */
       const pack = common.readJson(`${PluginPath}/package.json`)
       /** 旧版本入口文件 */
-      const index = this.getIndex(PluginPath, process.env.karin_app_lang)
+      const index = this.getIndex(PluginPath, dir, process.env.karin_app_lang)
       if (index) {
-        this.FileList.push({ dir, name: index })
-        this.isDev && this.watchList.push({ dir, name: index })
+        this.FileList.push({ dir: index.dir, name: index.name })
+        this.isDev && this.watchList.push({ dir: index.dir, name: index.name })
       }
       /** 新版本入口 */
       if (pack.main) {
@@ -175,11 +175,15 @@ class PluginLoader {
      * @param path - 插件路径
      * @param lang - 语言环境
      */
-  getIndex (path, lang) {
+  getIndex (path, dir, lang) {
     const isJS = common.exists(`${path}/index.js`)
-    if (isJS && lang === 'js') { return 'index.js' }
-    const isTS = common.exists(`${path}/index.ts`)
-    if (isTS && lang === 'ts') { return 'index.ts' }
+    if (isJS && lang === 'js') {
+      return { dir, name: 'index.js' }
+    }
+    const isTS = common.exists(`${path}/src/index.ts`)
+    if (isTS && lang === 'ts') {
+      return { dir: `${dir}/src`, name: 'index.ts' }
+    }
     return false
   }
 
@@ -386,7 +390,7 @@ class PluginLoader {
      * 新增accept、handler
      */
   async addAccept (index, Class) {
-    if (Class.accept && typeof Class.accept === 'function') {
+    if ('accept' in Class && typeof Class.accept === 'function') {
       this.PluginList[index].accept = true
       this.acceptIds.push(index)
     }
@@ -410,7 +414,7 @@ class PluginLoader {
      * 执行初始化
      */
   async addInit (Class) {
-    Class.init && await Class.init()
+    'init' in Class && typeof Class.init === 'function' && await Class.init()
   }
 
   /**

package/lib/event/message.d.ts

@@ -32,7 +32,7 @@ export declare class KarinMessage extends KarinEvent {
         /**
          * - 消息序列号
          */
-        message_seq?: string;
+        message_seq?: number;
         /**
          * - 原始消息文本
          */
@@ -61,7 +61,7 @@ export declare class KarinMessage extends KarinEvent {
     /**
      * - 消息序列号
      */
-    message_seq?: string;
+    message_seq?: number;
     /**
      * - 原始消息文本
      */

package/lib/event/message.js

@@ -3,7 +3,7 @@ import { KarinEvent } from './event.js'
  * - 消息事件基类
  */
 export class KarinMessage extends KarinEvent {
-  constructor ({ event = 'message', event_id, self_id, user_id, time, message_id, message_seq = '', raw_message = '', contact, sender, elements, group_id = '' }) {
+  constructor ({ event = 'message', event_id, self_id, user_id, time, message_id, message_seq = 0, raw_message = '', contact, sender, elements, group_id = '' }) {
     super({ event, event_id: event_id || message_id, self_id, user_id, group_id, time, contact, sender, sub_event: contact.scene === 'group' ? 'group_message' : 'private_message' })
     this.message_id = message_id
     this.message_seq = message_seq

package/lib/types/adapter.d.ts

@@ -3,6 +3,7 @@ import { IncomingMessage } from 'http';
 import { contact } from './event.js';
 import { KarinElement, KarinNodeElement } from './element.js';
 import { PushMessageBody, EssenceMessageBody, FriendInfo, GroupInfo, GroupMemberInfo, GroupHonorInfo } from './api.js';
+import { LoggerLevel } from './logger.js';
 export interface KarinAdapter {
     /**
      * - 适配器版本信息
@@ -82,7 +83,7 @@ export interface KarinAdapter {
      * @param level - 日志等级
      * @param args - 日志内容
      */
-    logger(level: 'info' | 'error' | 'trace' | 'debug' | 'mark' | 'warn' | 'fatal', ...args: any[]): void;
+    logger(level: LoggerLevel, ...args: any[]): void;
     /**
      * - 可选方法 仅ws有效 在注册适配器后 如果有符合的path则会调用此方法
      * - @param socket - WebSocket实例

package/lib/types/api.d.ts

@@ -75,7 +75,7 @@ export interface EssenceMessageBody {
     /**
      * - 消息序列号
      */
-    message_seq: string;
+    message_seq: number;
     /**
      * - 被设置的精华消息元素文本
      */

package/lib/types/event.d.ts

@@ -697,7 +697,7 @@ export interface KarinMessageEvent extends KarinEventType {
     /**
      * - 消息序列号
      */
-    message_seq?: string;
+    message_seq?: number;
     /**
      * - 原始消息文本
      */

package/lib/types/logger.d.ts

@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+export type LoggerLevel = 'trace' | 'debug' | 'mark' | 'info' | 'mark' | 'warn' | 'error' | 'fatal';
 export interface Logger {
     /**
      * 颜色模块
@@ -50,7 +51,7 @@ export interface Logger {
      * @param id 机器人ID
      * @param args 参数
      */
-    bot: (level: 'trace' | 'debug' | 'mark' | 'info' | 'mark' | 'warn' | 'error' | 'fatal', id: string, ...args: string[]) => void;
+    bot: (level: LoggerLevel, id: string, ...args: string[]) => void;
 }
 declare module 'log4js' {
     interface Logger {
@@ -104,6 +105,6 @@ declare module 'log4js' {
          * @param id 机器人ID
          * @param args 参数
          */
-        bot: (level: 'trace' | 'debug' | 'mark' | 'info' | 'mark' | 'warn' | 'error' | 'fatal', id: string, ...args: string[]) => void;
+        bot: (level: LoggerLevel, id: string, ...args: string[]) => void;
     }
 }

package/lib/types/plugin.d.ts

@@ -179,6 +179,7 @@ export interface PluginType {
      * - 根据上报中的event字段来获取e的事件类型
      */
     e: KarinMessageEvent | KarinNoticeEvent | KarinRequestEvent;
+    init?: () => Promise<any>;
     /**
      * - 快速回复
      */

package/lib/utils/ffmpeg.d.ts

@@ -1,7 +1,7 @@
 /**
  * 执行 ffmpeg 命令
  */
-export default function ffmpeg(): Promise<false | ((cmd: string, log?: boolean, options?: {
+export declare function ffmpeg(): Promise<false | ((cmd: string, log?: boolean, options?: {
     cwd: string;
     encoding: string;
 }) => Promise<{

package/lib/utils/ffmpeg.js

@@ -4,7 +4,7 @@ import { config } from './config.js'
 /**
  * 执行 ffmpeg 命令
  */
-export default async function ffmpeg () {
+export async function ffmpeg () {
   let ffmpeg = 'ffmpeg'
   const { status } = await exec('ffmpeg -version', false)
   if (status !== 'ok') {

package/package.json

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