node-karin 0.6.25 → 0.6.27

package/lib/core/plugin.loader.js

@@ -256,7 +256,7 @@ class PluginLoader {
   async createdApp (dir, name, isOrderBy = false, isNpm = false) {
     try {
       const list = []
-      let path = `${this.dirPath}${isNpm ? 'node_modules ' : '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.d.ts

@@ -37,7 +37,7 @@ export declare const Cfg: {
     review: boolean;
     logger: import("log4js").Logger;
     initCfg(): Promise<void>;
-    getPlugins(): string[];
+    getPlugins(): Promise<string[]>;
     mkdir(dirname: string): boolean;
     dirPath(_path: string, plugins: string[]): Promise<void>;
     timeout(type?: "ws" | "grpc"): number;

package/lib/utils/common.js

@@ -406,21 +406,38 @@ export const common = new (class Common {
     const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf8'))
     const dependencies = Object.keys(pkg.dependencies).filter((name) => !pkgdependencies.includes(name))
     if (!showDetails) {
-      return dependencies
+      const list = []
+      // 检查pkg是否存在karin字段
+      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) { list.push(name) }
+        } catch { }
+      }
+      await Promise.all(dependencies.map(readPackageJson))
+      return list
     } 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 && pkg?.karin?.apps?.length) {
-            pkg.karin.apps.forEach((app) => {
-              fs.readdirSync(`./node_modules/${name}/${app}`).forEach((dir) => {
-                /** 忽略非js */
-                if (!dir.endsWith('.js')) { return }
-                list.push({ dir, name })
+          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 { }
       }

package/lib/utils/config.d.ts

@@ -26,7 +26,7 @@ export declare const config: {
     logger: Logger;
     /** 初始化配置 */
     initCfg(): Promise<void>;
-    getPlugins(): string[];
+    getPlugins(): Promise<string[]>;
     /**
      * 递归创建目录
      * @param dirname - 要创建的文件夹路径

package/lib/utils/config.js

@@ -1,6 +1,7 @@
 import path from 'path'
 import { karinDir } from '../core/dir.js'
 import { fs, yaml as Yaml, chokidar } from '../modules.js'
+import { common } from './common.js'
 /**
  * 配置文件
  */
@@ -57,7 +58,7 @@ export const config = new (class Cfg {
       })
     }
     /** 为每个插件包创建统一存储的文件夹 */
-    const plugins = this.getPlugins()
+    const plugins = await this.getPlugins()
     const DataList = [
       'data',
       'temp',
@@ -69,10 +70,14 @@ export const config = new (class Cfg {
     this.logger = (await import('./logger.js')).default
   }
 
-  getPlugins () {
+  async getPlugins () {
+    const list = []
     const files = fs.readdirSync('./plugins', { withFileTypes: true })
     // 过滤掉非karin-plugin-开头的文件夹
-    return files.filter(file => file.isDirectory() && (file.name.startsWith('karin-plugin-'))).map(dir => dir.name)
+    list.push(...files.filter(file => file.isDirectory() && (file.name.startsWith('karin-plugin-'))).map(dir => dir.name))
+    // 获取npm插件
+    list.push(...(await common.getNpmPlugins(false)))
+    return list
   }
 
   /**

package/package.json

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