node-karin 0.6.24 → 0.6.26

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

@@ -99,7 +99,7 @@ export class OB11Event {
             role: "unknown" /* Role.Unknown */,
         };
         const contact = {
-            scene: ('group_id' in data ? 'group' : 'friend'),
+            scene: 'group_id' in data ? "group" /* Scene.Group */ : "friend" /* Scene.Private */,
             peer: 'group_id' in data ? data.group_id : data.user_id,
             sub_peer: '',
         };
@@ -324,6 +324,8 @@ export class OB11Event {
                         // todo kritor没有这个事件
                         this.adapter.logger('info', `[群荣誉变更]：${JSON.stringify(data)}`);
                         break;
+                    default:
+                        return this.adapter.logger('error', '未知通知事件：', JSON.stringify(data));
                 }
                 break;
             case 'group_msg_emoji_like': {

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

@@ -85,7 +85,7 @@ declare class PluginLoader {
     /**
      * 获取所有插件
      */
-    getPlugins(): `karin-plugin-${string}`[];
+    getPlugins(): Promise<string[]>;
     /**
      * 获取指定文件夹下的所有插件
      * @param dir - 插件包名称
@@ -102,8 +102,9 @@ declare class PluginLoader {
      * @param dir - 插件包路径
      * @param name - 插件名称
      * @param isOrderBy - 是否为动态导入 默认为静态导入
+     * @param isNpm - 是否为npm包
      */
-    createdApp(dir: dirName, name: fileName, isOrderBy?: boolean): Promise<boolean>;
+    createdApp(dir: dirName, name: fileName, isOrderBy?: boolean, isNpm?: boolean): Promise<boolean>;
     /**
      * 新增rule
      */

package/lib/core/plugin.loader.js

@@ -84,7 +84,7 @@ class PluginLoader {
      * 插件初始化
      */
   async load () {
-    this.getPlugins()
+    await this.getPlugins()
     listener.once('plugin.watch', () => {
       for (const v of this.watchList) {
         v.name ? this.watch(v.dir, v.name) : this.watchDir(v.dir)
@@ -95,6 +95,10 @@ class PluginLoader {
     logger.info('加载插件中..')
     /** 载入插件 */
     const promises = this.FileList.map(async ({ dir, name }) => await this.createdApp(dir, name, false))
+    /** 获取npm插件 */
+    const npm = await common.getNpmPlugins(true)
+    /** 载入npm插件 */
+    promises.push(...npm.map(async ({ dir, name }) => await this.createdApp(dir, name, false, true)))
     /** 等待所有插件加载完成 */
     await Promise.all(promises)
     /** 释放缓存 */
@@ -108,7 +112,7 @@ class PluginLoader {
   /**
      * 获取所有插件
      */
-  getPlugins () {
+  async getPlugins () {
     /** 获取所有插件包 */
     const plugins = common.getPlugins()
     for (const dir of plugins) {
@@ -247,11 +251,12 @@ class PluginLoader {
      * @param dir - 插件包路径
      * @param name - 插件名称
      * @param isOrderBy - 是否为动态导入 默认为静态导入
+     * @param isNpm - 是否为npm包
      */
-  async createdApp (dir, name, isOrderBy = false) {
+  async createdApp (dir, name, isOrderBy = false, isNpm = false) {
     try {
       const list = []
-      let path = `${this.dirPath}plugins/${dir}/${name}`
+      let path = `${this.dirPath}${isNpm ? 'node_modules' : 'plugins'}/${dir}/${name}`
       if (isOrderBy) { path = path + `?${Date.now()}` }
       const tmp = await import(path)
       lodash.forEach(tmp, (App) => {

package/lib/index.js

@@ -1,8 +1,3 @@
-/// <reference types="@types/express" />
-/// <reference types="@types/lodash" />
-/// <reference types="@types/node" />
-/// <reference types="@types/node-schedule" />
-/// <reference types="@types/ws" />
 // 基本模块
 export * from 'kritor-proto';
 export * from './core/index.js';

package/lib/types/plugin.d.ts

@@ -6,8 +6,10 @@ import { KarinNoticeType, KarinRequestType, AllListenEvent, KarinEventTypes, Kar
  * - 插件根目录名称
  * - 例如: karin-plugin-example
  * - 例如: karin-plugin-example/apps
+ * - ### npm包类型: `string`
+ * - ### git插件类型: `karin-plugin-${string}`
  */
-export type dirName = `karin-plugin-${string}`;
+export type dirName = `karin-plugin-${string}` | string;
 /**
  * - 插件名称
  * - 例如: index.js index.ts

package/lib/utils/common.d.ts

@@ -1,7 +1,7 @@
 import { AxiosRequestConfig } from 'axios';
 import { Readable } from 'stream';
 import { fs } from '../modules.js';
-import { dirName, KarinElement, NodeElement } from '../types/index.js';
+import { dirName, fileName, KarinElement, NodeElement } from '../types/index.js';
 /**
  * 常用方法
  */
@@ -136,10 +136,19 @@ export declare const common: {
      */
     makeForward(elements: KarinElement | KarinElement[], fakeUin: string, fakeNick: string): Array<NodeElement>;
     /**
-     * 获取所有插件列表
+     * 获取git插件列表
      * @param isPack - 是否屏蔽不带package.json的插件，默认为false
      */
     getPlugins(isPack?: boolean): Array<dirName>;
+    /**
+     * 获取npm插件列表
+     * @param showDetails - 是否返回详细信息，默认为false
+     * 默认只返回插件npm包名，为true时返回详细的{dir, name}[]
+     */
+    getNpmPlugins<T extends boolean>(showDetails: T): Promise<T extends true ? {
+        dir: string;
+        name: fileName;
+    }[] : string[]>;
     /**
      * 获取运行时间
      */

package/lib/utils/common.js

@@ -364,7 +364,7 @@ export const common = new (class Common {
   }
 
   /**
-     * 获取所有插件列表
+     * 获取git插件列表
      * @param isPack - 是否屏蔽不带package.json的插件，默认为false
      */
   getPlugins (isPack = false) {
@@ -378,6 +378,64 @@ export const common = new (class Common {
     return arr
   }
 
+  /**
+     * 获取npm插件列表
+     * @param showDetails - 是否返回详细信息，默认为false
+     * 默认只返回插件npm包名，为true时返回详细的{dir, name}[]
+     */
+  async getNpmPlugins (showDetails) {
+    /** 屏蔽的依赖包列表 */
+    const pkgdependencies = [
+      '@grpc/grpc-js',
+      '@grpc/proto-loader',
+      'art-template',
+      'axios',
+      'chalk',
+      'chokidar',
+      'express',
+      'kritor-proto',
+      'level',
+      'lodash',
+      'log4js',
+      'moment',
+      'node-schedule',
+      'redis',
+      'ws',
+      'yaml',
+    ]
+    const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf8'))
+    const dependencies = Object.keys(pkg.dependencies).filter((name) => !pkgdependencies.includes(name))
+    if (!showDetails) {
+      return dependencies
+    } else {
+      const list = []
+      const readPackageJson = async (name) => {
+        try {
+          const pkgPath = path.join(process.cwd(), 'node_modules', name, 'package.json')
+          const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
+          if (pkg?.karin) {
+            if (pkg?.main) {
+              const dir = `${name}/${path.dirname(pkg.main).replace(/\.\//, '')}`
+              list.push({ dir, name: path.basename(pkg.main) })
+            }
+            if (pkg?.karin?.apps?.length) {
+              pkg.karin.apps.forEach((app) => {
+                fs.readdirSync(`./node_modules/${name}/${app}`).forEach((name) => {
+                  /** 忽略非js */
+                  if (!name.endsWith('.js')) { return }
+                  const dir = `${name}/${app}`
+                  list.push({ dir, name })
+                })
+              })
+            }
+          }
+        } catch { }
+      }
+      await Promise.all(dependencies.map(readPackageJson))
+      return list
+    }
+  }
+
   /**
      * 获取运行时间
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.6.24",
+  "version": "0.6.26",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -49,9 +49,8 @@
     "sort": "npx sort-package-json"
   },
   "dependencies": {
-    "@grpc/grpc-js": "1.10.10",
+    "@grpc/grpc-js": "1.10.11",
     "@grpc/proto-loader": "0.7.13",
-    "@inquirer/prompts": "5.1.2",
     "art-template": "4.13.2",
     "axios": "1.7.2",
     "chalk": "5.3.0",
@@ -64,8 +63,8 @@
     "moment": "2.30.1",
     "node-schedule": "2.1.1",
     "redis": "4.6.14",
-    "ws": "8.16.0",
-    "yaml": "2.4.1"
+    "ws": "8.18.0",
+    "yaml": "2.4.5"
   },
   "devDependencies": {
     "@types/express": "latest",