fix: 修正cli

KarinJS · Sep 14, 2024 · 4214f07 · 4214f07
1 parent 7a6ab5d
commit 4214f07
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 8 deletions.
diff --git a/eslint.config.js b/eslint.config.js
@@ -1,7 +1,7 @@
 import neostandard from 'neostandard'
 
 export default neostandard({
-  ignores: ['node_modules', 'temp', 'logs', 'data'],
+  ignores: ['node_modules', 'temp', 'logs', 'data', 'lib'],
   globals: ['logger', 'NodeJS'],
   ts: true,
 }).map(val => {

diff --git a/package.json b/package.json
@@ -118,7 +118,7 @@
   ],
   "scripts": {
     ".": "node lib/cli/start.js .",
-    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && npm run fix:all",
+    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json",
     "build:npm": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json",
     "dev": "node lib/cli/start.js dev",
     "fix": "eslint lib/**/*.js --fix",
@@ -167,4 +167,4 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   }
-}
+}
diff --git a/src/api/npm.ts b/src/api/npm.ts
@@ -23,7 +23,7 @@ export async function getNpmPlugins<T extends boolean> (showDetails: T): Promise
         const pkg = readJson(pkgPath)
         if (pkg?.karin) list.push(name)
       } catch (error: any) {
-        logger.error(`[common] 解析 package.json 时出错：${error.stack || error.message || JSON.stringify(error)}`)
+        console.error(`[common] 解析 package.json 时出错：${error.stack || error.message || JSON.stringify(error)}`)
       }
     }
 
@@ -47,7 +47,7 @@ export async function getNpmPlugins<T extends boolean> (showDetails: T): Promise
       if (pkg?.karin?.apps?.length) {
         pkg.karin.apps.forEach((app: string) => {
           if (!fs.existsSync(path.join(root, app))) {
-            logger.error(`[common] npm插件${files}的app目录${app}不存在 已跳过`)
+            console.error(`[common] npm插件${files}的app目录${app}不存在 已跳过`)
             return
           }
 
@@ -59,7 +59,7 @@ export async function getNpmPlugins<T extends boolean> (showDetails: T): Promise
         })
       }
     } catch (error: any) {
-      logger.error(`[common] 获取npm插件列表时出错：${error.stack || error.message || JSON.stringify(error)}`)
+      console.error(`[common] 获取npm插件列表时出错：${error.stack || error.message || JSON.stringify(error)}`)
     }
   }
 

diff --git a/src/types/element/element.ts b/src/types/element/element.ts
@@ -1,4 +1,4 @@
-export type ElementType = 'text' | 'at' | 'face' | 'bubble_face' | 'reply' | 'image' | 'video' | 'basketball' | 'dice' | 'rps' | 'poke' | 'music' | 'weather' | 'location' | 'share' | 'gift' | 'market_face' | 'forward' | 'contact' | 'json' | 'xml' | 'file' | 'markdown' | 'markdown_tpl' | 'keyboard' | 'node' | 'rows' | 'record' | 'long_msg' | 'raw'
+export type ElementType = 'text' | 'at' | 'face' | 'bubble_face' | 'reply' | 'image' | 'video' | 'basketball' | 'dice' | 'rps' | 'poke' | 'music' | 'weather' | 'location' | 'share' | 'gift' | 'market_face' | 'forward' | 'contact' | 'json' | 'xml' | 'file' | 'markdown' | 'markdown_tpl' | 'keyboard' | 'node' | 'rows' | 'record' | 'long_msg' | 'raw' | 'passive_reply'
 
 export interface Element {
   /**
@@ -585,6 +585,14 @@ export interface LongMsgElement extends Element {
   id: string
 }
 
+/**
+ * - 回复被动消息 键入此字段代表此条消息为被动消息
+ */
+export interface PassiveElement extends Element {
+  type: 'passive_reply'
+  id: string
+}
+
 /**
  * 原生元素
  */
@@ -593,7 +601,7 @@ export interface RawElement extends Element {
   data: any
 }
 
-export type KarinElement = TextElement | AtElement | FaceElement | BubbleFaceElement | ReplyElement | ImageElement | VideoElement | BasketballElement | DiceElement | RpsElement | PokeElement | MusicElement | WeatherElement | LocationElement | ShareElement | GiftElement | MarketFaceElement | ForwardElement | ContactElement | JsonElement | XmlElement | FileElement | ButtonElement | KeyBoardElement | RecordElement | LongMsgElement | TplMarkdownElement | RawMarkdownElement | RawElement
+export type KarinElement = TextElement | AtElement | FaceElement | BubbleFaceElement | ReplyElement | ImageElement | VideoElement | BasketballElement | DiceElement | RpsElement | PokeElement | MusicElement | WeatherElement | LocationElement | ShareElement | GiftElement | MarketFaceElement | ForwardElement | ContactElement | JsonElement | XmlElement | FileElement | ButtonElement | KeyBoardElement | RecordElement | LongMsgElement | TplMarkdownElement | RawMarkdownElement | RawElement | PassiveElement
 
 /**
  * - 构建自定义转发节点 此元素仅可通过专用接口发送 不支持混合发送

diff --git a/src/types/event/contact.ts b/src/types/event/contact.ts
@@ -2,11 +2,19 @@
  * - 事件来源枚举
  */
 export const enum Scene {
+  /** 群 */
   Group = 'group',
+  /** 好友 */
   Private = 'friend',
+  /** 频道 */
   Guild = 'guild',
+  /** 频道私信 */
+  GuildPrivate = 'guild_private',
+  /** 临时会话 */
   Nearby = 'nearby',
+  /** 陌生人 */
   Stranger = 'stranger',
+  /** 临时群会话 */
   StrangerFromGroup = 'stranger_from_group',
 }
 

diff --git a/src/utils/core/segment.ts b/src/utils/core/segment.ts
@@ -591,4 +591,14 @@ export const segment = new (class Segment {
       data,
     }
   }
+
+  /**
+   * 回复被动消息
+   */
+  passive_reply (id: string): { type: 'passive_reply', id: string } {
+    return {
+      type: 'passive_reply',
+      id,
+    }
+  }
 })()