node-karin 1.9.3 → 1.9.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # 更新日志
 
+## [1.9.4](https://github.com/KarinJS/Karin/compare/core-v1.9.3...core-v1.9.4) (2025-05-21)
+
+
+### 🐛 Bug Fixes
+
+* close [#436](https://github.com/KarinJS/Karin/issues/436) ([9ff2938](https://github.com/KarinJS/Karin/commit/9ff2938a386193c42cef91160205d254865e77c3))
+* 升级版本后重启找不到入口文件 ([eadc52f](https://github.com/KarinJS/Karin/commit/eadc52f6e3206b9b5c399e689c64ab7c95f18c8a))
+
+
+### ⚡️ Performance
+
+* 优化`raceRequest`函数 ([0455a3c](https://github.com/KarinJS/Karin/commit/0455a3c3e9cba1f19c7b6ed1862a16f072cd3599))
+* 优化全局配置 添加对应配置项 ([f6c81d3](https://github.com/KarinJS/Karin/commit/f6c81d38d20397f9391ec44703126bafc3c52197))
+
 ## [1.9.3](https://github.com/KarinJS/Karin/compare/core-v1.9.2...core-v1.9.3) (2025-05-17)
 
 

package/dist/index.d.ts

@@ -7488,6 +7488,8 @@ interface Package {
 interface GroupsObjectValue {
     /** 配置键: `Bot:selfId:groupId` */
     key: string;
+    /** 是否继承全局配置 默认`true` */
+    inherit: boolean;
     /** 群聊、频道中所有消息冷却时间，单位秒，0则无限制 */
     cd: number;
     /** 群聊、频道中 每个人的消息冷却时间，单位秒，0则无限制。注意，开启后所有消息都会进CD，无论是否触发插件。 */
@@ -7516,6 +7518,8 @@ type Groups = GroupsObjectValue[];
 interface PrivatesObjectValue {
     /** 配置键 `Bot:selfId:userId` */
     key: string;
+    /** 是否继承全局配置 默认`true` */
+    inherit: boolean;
     /** 好友消息冷却时间，单位秒，0则无限制 */
     cd: number;
     /** 机器人响应模式，0-所有 2-仅回应管理员 3-仅回应别名 5-管理员无限制，非管理员别名 6-仅回应主人 */
@@ -11752,10 +11756,14 @@ declare const makeMessage: (elements: SendMessage) => Array<Elements>;
  */
 declare const makeForward: (elements: SendMessage | Array<Elements[]>, fakeId?: string, fakeName?: string) => Array<CustomNodeElement>;
 
+interface RaceRequestConfig extends AxiosRequestConfig {
+    /** 响应成功状态码 默认[200] */
+    successCodes?: number[];
+}
 /**
  * 竞速请求 返回最先成功响应的数据
  * @param urls - 请求地址数组
- * @param config - 请求配置 默认 { timeout: 10000, method: 'HEAD' }
+ * @param config - 请求配置 默认 { timeout: 10000, method: 'HEAD', successCodes: [200] }
  * @returns 返回最先成功响应的数据
  * @example
  * const urls = ['https://api.github.com', 'https://api.gitee.com']
@@ -11766,11 +11774,13 @@ declare const makeForward: (elements: SendMessage | Array<Elements[]>, fakeId?:
  * const urls = ['https://api.github.com/post', 'https://api.gitee.com/post']
  * const data = await raceRequest(urls, {
  *   method: 'post',
- *   data: { foo: 'bar' }
+ *   data: { foo: 'bar' },
+ *   timeout: 10000,
+ *   successCodes: [200, 201]
  * })
  * console.log(data)
  */
-declare const raceRequest: <R = AxiosRequestConfig, T = any>(urls: string[], config?: AxiosRequestConfig) => Promise<AxiosResponse<T, R> | null>;
+declare const raceRequest: <R = AxiosRequestConfig, T = any>(urls: string[], config?: RaceRequestConfig) => Promise<AxiosResponse<T, R> | null>;
 /**
  * 测试网络请求
  * @template D - 请求数据类型
@@ -11984,6 +11994,95 @@ declare const average: (numbers: number[]) => number;
  *          round(1.235, 2) // 返回 1.24
  */
 declare const round: (num: number, decimals?: number) => number;
+/**
+ * 判断是否为数字 处理NaN的情况
+ * @param num 需要判断的数字
+ * @param defaultValue 默认值 如果非数字 返回默认值
+ * @returns 处理后的数字
+ * @example isNumber(NaN) // 返回 0
+ *          isNumber(123) // 返回 123
+ *          isNumber('abc', 123) // 返回 123
+ */
+declare const isNumber: (num: unknown, defaultValue?: number) => number;
+/**
+ * 判断数组中的元素是否为数字
+ * @description 从索引0开始寻找，如果找到数字则返回数字，否则返回默认值
+ * @param arr 需要判断的数组
+ * @param defaultValue 默认值 如果非数字 返回默认值
+ * @returns 数字或默认值
+ * @example isNumberInArray([1, '2', 3], 0) // 返回 1
+ *          isNumberInArray(['1', '2', '3'], 0) // 返回 0
+ */
+declare const isNumberInArray: <T = number>(arr: unknown[], defaultValue?: number) => T;
+
+/**
+ * 字符串工具
+ */
+declare const strToBool: {
+    /**
+     * 将数组中的所有元素转换为字符串 使用`String`转换
+     * @param arr 需要转换的数组
+     * @returns 转换后的字符串
+     * @example strToBool.array([1, '2']) // ['1', '2']
+     *          strToBool.array(['3', null, undefined, NaN, '']) // ['3']
+     */
+    array: (arr: unknown[]) => string[];
+    /**
+     * 排除数组中所有非字符串的元素
+     * @param arr 需要转换的数组
+     * @returns 转换后的字符串
+     * @example strToBool.arrayExcludeNonString(['1', '2', '3']) // ['1', '2', '3']
+     *          strToBool.arrayExcludeNonString(['1', '2', '3', null, undefined, NaN, '']) // ['1', '2', '3']
+     */
+    arrayExcludeNonString: (arr: unknown[]) => string[];
+    /**
+     * 将字符串转换为布尔值
+     * @param str 需要转换的字符串
+     * @returns 转换后的布尔值
+     * @example strToBool.string('true') // true
+     *          strToBool.string('1') // true
+     *          strToBool.string('yes') // true
+     *          strToBool.string('on') // true
+     *          strToBool.string('false') // false
+     *          strToBool.string('0') // false
+     *          strToBool.string('no') // false
+     */
+    string: (str: string) => boolean;
+    /**
+     * 将字符串转换为数字
+     * @param str 需要转换的字符串
+     * @param defaultValue 默认值 如果非数字 返回默认值
+     * @returns 转换后的数字
+     * @example strToBool.number('1') // 1
+     *          strToBool.number('2') // 2
+     *          strToBool.number('3') // 3
+     *          strToBool.number('abc', 123) // 123
+     */
+    number: (str: string, defaultValue?: number) => number;
+    /**
+     * 将字符串数组转换为数字数组
+     * @param arr 需要转换的数组
+     * @returns 转换后的数字数组
+     * @example strToBool.arrayNumber(['1', '2', '3']) // [1, 2, 3]
+     */
+    arrayNumber: (arr: string[]) => number[];
+    /**
+     * 传入一个数组 按照索引返回数组 并且将这个数组转换为字符串数组 去掉重复、非字符串的元素
+     * @param arr 需要转换的数组
+     * @param index 需要返回的索引
+     * @returns 转换后的字符串数组
+     * @example strToBool.arrayString(['1', '2', '3'], 0) // ['1']
+     */
+    arrayString: (arr: unknown[]) => string[];
+    /**
+     * 合并多个数组为一个并去重 如果不是数组将会跳过
+     * @param arr 需要合并的数组
+     * @returns 合并后的数组
+     * @example strToBool.mergeArray(['1', '2', '3'], ['4', '5', '6']) // ['1', '2', '3', '4', '5', '6']
+     *          strToBool.mergeArray(['4', '5', '6'], ['4', '5', '6']) // ['4', '5', '6']
+     */
+    mergeArray: <T>(...arr: unknown[]) => T[];
+};
 
 /**
  * 休眠函数
@@ -12131,6 +12230,8 @@ declare const index$1_getNpmPlugins: typeof getNpmPlugins;
 declare const index$1_getRelPath: typeof getRelPath;
 declare const index$1_isDir: typeof isDir;
 declare const index$1_isEven: typeof isEven;
+declare const index$1_isNumber: typeof isNumber;
+declare const index$1_isNumberInArray: typeof isNumberInArray;
 declare const index$1_isPlugin: typeof isPlugin;
 declare const index$1_karinToQQBot: typeof karinToQQBot;
 declare const index$1_makeForward: typeof makeForward;
@@ -12142,12 +12243,13 @@ declare const index$1_random: typeof random;
 declare const index$1_round: typeof round;
 declare const index$1_sleep: typeof sleep;
 declare const index$1_splitPath: typeof splitPath;
+declare const index$1_strToBool: typeof strToBool;
 declare const index$1_stream: typeof stream;
 declare const index$1_updateYaml: typeof updateYaml;
 declare const index$1_uptime: typeof uptime;
 declare const index$1_urlToPath: typeof urlToPath;
 declare namespace index$1 {
-  export { type index$1_AxiosFn as AxiosFn, type index$1_NpmInfo as NpmInfo, index$1_absPath as absPath, index$1_average as average, index$1_axios as axios, index$1_base64 as base64, index$1_buffer as buffer, karinToQQBot as buttonToQQBot, index$1_clamp as clamp, index$1_createRawMessage as createRawMessage, index$1_diffArray as diffArray, index$1_diffSimpleArray as diffSimpleArray, index$1_downFile as downFile, existToMkdir as exists, index$1_formatNumber as formatNumber, index$1_formatTime as formatTime, index$1_formatUnit as formatUnit, index$1_getAbsPath as getAbsPath, index$1_getGitPlugins as getGitPlugins, index$1_getNpmPlugins as getNpmPlugins, getPlugins$1 as getPlugins, index$1_getRelPath as getRelPath, index$1_isDir as isDir, index$1_isEven as isEven, index$1_isPlugin as isPlugin, index$1_karinToQQBot as karinToQQBot, index$1_makeForward as makeForward, index$1_makeMessage as makeMessage, createRawMessage as makeMessageLog, index$1_mergeImage as mergeImage, mkdirSync as mkdir, index$1_percentage as percentage, getPluginInfo as pkgJson, pkgRoot as pkgroot, index$1_qqbotToKarin as qqbotToKarin, index$1_random as random, readJsonSync as readJson, read as readYaml, index$1_round as round, index$1_sleep as sleep, index$1_splitPath as splitPath, index$1_stream as stream, index$1_updateYaml as updateYaml, index$1_uptime as uptime, index$1_urlToPath as urlToPath, writeJsonSync as writeJson, write as writeYaml };
+  export { type index$1_AxiosFn as AxiosFn, type index$1_NpmInfo as NpmInfo, index$1_absPath as absPath, index$1_average as average, index$1_axios as axios, index$1_base64 as base64, index$1_buffer as buffer, karinToQQBot as buttonToQQBot, index$1_clamp as clamp, index$1_createRawMessage as createRawMessage, index$1_diffArray as diffArray, index$1_diffSimpleArray as diffSimpleArray, index$1_downFile as downFile, existToMkdir as exists, index$1_formatNumber as formatNumber, index$1_formatTime as formatTime, index$1_formatUnit as formatUnit, index$1_getAbsPath as getAbsPath, index$1_getGitPlugins as getGitPlugins, index$1_getNpmPlugins as getNpmPlugins, getPlugins$1 as getPlugins, index$1_getRelPath as getRelPath, index$1_isDir as isDir, index$1_isEven as isEven, index$1_isNumber as isNumber, index$1_isNumberInArray as isNumberInArray, index$1_isPlugin as isPlugin, index$1_karinToQQBot as karinToQQBot, index$1_makeForward as makeForward, index$1_makeMessage as makeMessage, createRawMessage as makeMessageLog, index$1_mergeImage as mergeImage, mkdirSync as mkdir, index$1_percentage as percentage, getPluginInfo as pkgJson, pkgRoot as pkgroot, index$1_qqbotToKarin as qqbotToKarin, index$1_random as random, readJsonSync as readJson, read as readYaml, index$1_round as round, index$1_sleep as sleep, index$1_splitPath as splitPath, index$1_strToBool as strToBool, index$1_stream as stream, index$1_updateYaml as updateYaml, index$1_uptime as uptime, index$1_urlToPath as urlToPath, writeJsonSync as writeJson, write as writeYaml };
 }
 
 /**
@@ -12173,13 +12275,6 @@ declare const initCount: (count: Record<string, {
  * @returns 统一后的数据
  */
 declare const formatObject: <T extends Record<string, any>>(data: T) => T;
-/**
- * 合并对象 专属privates、groups
- * @param def 默认配置
- * @param cfg 配置
- * @returns 合并后的配置
- */
-declare const mergeDegAndCfg: <T extends Record<string, any>>(def: T, cfg: T) => T;
 /**
  * @internal
  * @description 创建缓存对象
@@ -12466,7 +12561,6 @@ declare const index_initConfigCache: typeof initConfigCache;
 declare const index_initCount: typeof initCount;
 declare const index_initPm2: typeof initPm2;
 declare const index_master: typeof master;
-declare const index_mergeDegAndCfg: typeof mergeDegAndCfg;
 declare const index_pkg: typeof pkg;
 declare const index_pm2: typeof pm2;
 declare const index_port: typeof port;
@@ -12479,7 +12573,7 @@ declare const index_updateLevel: typeof updateLevel;
 declare const index_webSocketServerToken: typeof webSocketServerToken;
 declare const index_writeEnv: typeof writeEnv;
 declare namespace index {
-  export { index_adapter as adapter, index_admin as admin, index_authKey as authKey, index_clearCache as clearCache, index_clearFiles as clearFiles, index_config as config, index_createCount as createCount, index_defaultConfig as defaultConfig, index_env as env, index_ffmpegPath as ffmpegPath, index_ffplayPath as ffplayPath, index_ffprobePath as ffprobePath, index_formatArray as formatArray, index_formatObject as formatObject, index_getCacheCfg as getCacheCfg, index_getDirectCfg as getDirectCfg, index_getEnv as getEnv, index_getFriendCfg as getFriendCfg, index_getGroupCfg as getGroupCfg, index_getGroupsFileData as getGroupsFileData, index_getGuildCfg as getGuildCfg, index_getPrivatesFileData as getPrivatesFileData, index_getRenderCfg as getRenderCfg, index_getYaml as getYaml, index_groups as groups, index_host as host, index_initConfigCache as initConfigCache, index_initCount as initCount, index_initPm2 as initPm2, index_master as master, index_mergeDegAndCfg as mergeDegAndCfg, index_pkg as pkg, index_pm2 as pm2, index_port as port, index_privates as privates, redis$1 as redis, render$1 as render, index_setConfig as setConfig, index_setEnv as setEnv, index_setYaml as setYaml, index_timeout as timeout, index_updateLevel as updateLevel, index_webSocketServerToken as webSocketServerToken, index_writeEnv as writeEnv };
+  export { index_adapter as adapter, index_admin as admin, index_authKey as authKey, index_clearCache as clearCache, index_clearFiles as clearFiles, index_config as config, index_createCount as createCount, index_defaultConfig as defaultConfig, index_env as env, index_ffmpegPath as ffmpegPath, index_ffplayPath as ffplayPath, index_ffprobePath as ffprobePath, index_formatArray as formatArray, index_formatObject as formatObject, index_getCacheCfg as getCacheCfg, index_getDirectCfg as getDirectCfg, index_getEnv as getEnv, index_getFriendCfg as getFriendCfg, index_getGroupCfg as getGroupCfg, index_getGroupsFileData as getGroupsFileData, index_getGuildCfg as getGuildCfg, index_getPrivatesFileData as getPrivatesFileData, index_getRenderCfg as getRenderCfg, index_getYaml as getYaml, index_groups as groups, index_host as host, index_initConfigCache as initConfigCache, index_initCount as initCount, index_initPm2 as initPm2, index_master as master, index_pkg as pkg, index_pm2 as pm2, index_port as port, index_privates as privates, redis$1 as redis, render$1 as render, index_setConfig as setConfig, index_setEnv as setEnv, index_setYaml as setYaml, index_timeout as timeout, index_updateLevel as updateLevel, index_webSocketServerToken as webSocketServerToken, index_writeEnv as writeEnv };
 }
 
 /**

package/dist/index.mjs

@@ -1576,6 +1576,19 @@ var init_default = __esm({
       groups: [
         {
           key: "default",
+          inherit: true,
+          cd: 0,
+          userCD: 0,
+          mode: 0,
+          alias: [],
+          enable: [],
+          disable: [],
+          member_enable: [],
+          member_disable: []
+        },
+        {
+          key: "global",
+          inherit: true,
           cd: 0,
           userCD: 0,
           mode: 0,
@@ -1587,6 +1600,7 @@ var init_default = __esm({
         },
         {
           key: "Bot:selfId",
+          inherit: true,
           cd: 0,
           userCD: 0,
           mode: 0,
@@ -1598,6 +1612,7 @@ var init_default = __esm({
         },
         {
           key: "Bot:selfId:groupId",
+          inherit: true,
           cd: 0,
           userCD: 0,
           mode: 0,
@@ -1609,6 +1624,7 @@ var init_default = __esm({
         },
         {
           key: "Bot:selfId:guildId",
+          inherit: true,
           cd: 0,
           userCD: 0,
           mode: 0,
@@ -1620,6 +1636,7 @@ var init_default = __esm({
         },
         {
           key: "Bot:selfId:guildId:channelId",
+          inherit: true,
           cd: 0,
           userCD: 0,
           mode: 0,
@@ -1649,6 +1666,16 @@ var init_default = __esm({
       privates: [
         {
           key: "default",
+          inherit: true,
+          cd: 0,
+          mode: 0,
+          alias: [],
+          enable: [],
+          disable: []
+        },
+        {
+          key: "global",
+          inherit: true,
           cd: 0,
           mode: 0,
           alias: [],
@@ -1657,6 +1684,7 @@ var init_default = __esm({
         },
         {
           key: "Bot:selfId",
+          inherit: true,
           cd: 0,
           mode: 0,
           alias: [],
@@ -1665,6 +1693,7 @@ var init_default = __esm({
         },
         {
           key: "Bot:selfId:userId",
+          inherit: true,
           cd: 0,
           mode: 0,
           alias: [],
@@ -3040,7 +3069,7 @@ var init_fs2 = __esm({
     init_fs();
   }
 });
-var diffArray, diffSimpleArray, clamp, random, formatNumber, percentage, formatUnit, isEven, average, round;
+var diffArray, diffSimpleArray, clamp, random, formatNumber, percentage, formatUnit, isEven, average, round, isNumber, isNumberInArray;
 var init_number = __esm({
   "src/utils/common/number.ts"() {
     diffArray = (old, data) => {
@@ -3089,6 +3118,17 @@ var init_number = __esm({
     round = (num, decimals = 0) => {
       return Number(Math.round(Number(num + "e" + decimals)) + "e-" + decimals);
     };
+    isNumber = (num, defaultValue = 0) => {
+      if (typeof num === "number") return num;
+      return defaultValue;
+    };
+    isNumberInArray = (arr, defaultValue = 0) => {
+      for (let i = 0; i < arr.length; i++) {
+        const item = arr[i];
+        if (typeof item === "number") return item;
+      }
+      return defaultValue;
+    };
   }
 });
 var TypedListeners, listeners;
@@ -3469,7 +3509,7 @@ var init_exec = __esm({
 });
 
 // src/utils/config/tools.ts
-var formatArray, initCount, formatObject, mergeDegAndCfg, createCount, getCacheCfg, clearCache;
+var formatArray, initCount, formatObject, createCount, getCacheCfg, clearCache;
 var init_tools = __esm({
   "src/utils/config/tools.ts"() {
     formatArray = (data) => {
@@ -3501,22 +3541,6 @@ var init_tools = __esm({
       });
       return list2;
     };
-    mergeDegAndCfg = (def, cfg) => {
-      const list2 = {};
-      Object.entries(cfg).forEach(([key, value]) => {
-        if (Array.isArray(value)) {
-          list2[key] = formatArray(value || def[key]);
-          return;
-        }
-        if (typeof value === "number") {
-          value = Number(value);
-          list2[key] = isNaN(value) ? def[key] : value;
-          return;
-        }
-        list2[key] = value || def[key];
-      });
-      return list2;
-    };
     createCount = () => {
       return {};
     };
@@ -11565,18 +11589,27 @@ var init_race = __esm({
   "src/utils/request/race.ts"() {
     raceRequest = async (urls, config3 = {
       method: "HEAD",
-      timeout: 2e3
+      timeout: 2e3,
+      successCodes: [200]
     }) => {
-      const requests = urls.map(async (url) => {
-        try {
-          const response = await axios9.request({ ...config3, url, timeout: config3.timeout || 2e3 });
-          return response;
-        } catch {
-          return null;
-        }
-      });
-      const results = await Promise.race(requests);
-      return results;
+      const successCodes = Array.isArray(config3.successCodes) && config3.successCodes.length > 0 ? config3.successCodes : [200];
+      const requests = urls.map(
+        (url) => new Promise((resolve, reject) => {
+          axios9.request({ ...config3, url, timeout: config3.timeout || 2e3 }).then((response) => {
+            if (successCodes.includes(response.status)) {
+              resolve(response);
+            } else {
+              reject(new Error(`\u54CD\u5E94\u72B6\u6001\u7801 ${response.status} \u4E0D\u5728 successCodes \u8303\u56F4\u5185`));
+            }
+          }).catch(reject);
+        })
+      );
+      try {
+        const result = await Promise.any(requests);
+        return result;
+      } catch {
+        return null;
+      }
     };
     pingRequest = async (urls, config3 = {
       timeout: 2e3,
@@ -15442,10 +15475,10 @@ function requireLodash_isnumber() {
   function isObjectLike(value) {
     return !!value && typeof value == "object";
   }
-  function isNumber(value) {
+  function isNumber2(value) {
     return typeof value == "number" || isObjectLike(value) && objectToString.call(value) == numberTag;
   }
-  lodash_isnumber = isNumber;
+  lodash_isnumber = isNumber2;
   return lodash_isnumber;
 }
 function requireLodash_isplainobject() {
@@ -15594,7 +15627,7 @@ function requireSign() {
   const includes = requireLodash_includes();
   const isBoolean = requireLodash_isboolean();
   const isInteger = requireLodash_isinteger();
-  const isNumber = requireLodash_isnumber();
+  const isNumber2 = requireLodash_isnumber();
   const isPlainObject = requireLodash_isplainobject();
   const isString = requireLodash_isstring();
   const once = requireLodash_once();
@@ -15626,9 +15659,9 @@ function requireSign() {
     allowInvalidAsymmetricKeyTypes: { isValid: isBoolean, message: '"allowInvalidAsymmetricKeyTypes" must be a boolean' }
   };
   const registered_claims_schema = {
-    iat: { isValid: isNumber, message: '"iat" should be a number of seconds' },
-    exp: { isValid: isNumber, message: '"exp" should be a number of seconds' },
-    nbf: { isValid: isNumber, message: '"nbf" should be a number of seconds' }
+    iat: { isValid: isNumber2, message: '"iat" should be a number of seconds' },
+    exp: { isValid: isNumber2, message: '"exp" should be a number of seconds' },
+    nbf: { isValid: isNumber2, message: '"nbf" should be a number of seconds' }
   };
   function validate(schema, allowUnknown, object, parameterName) {
     if (!isPlainObject(object)) {
@@ -16221,7 +16254,6 @@ __export(config_exports, {
   initCount: () => initCount,
   initPm2: () => initPm2,
   master: () => master,
-  mergeDegAndCfg: () => mergeDegAndCfg,
   pkg: () => pkg,
   pm2: () => pm2,
   port: () => port,
@@ -16284,6 +16316,102 @@ var init_ffmpeg = __esm({
   }
 });
 
+// src/utils/common/string.ts
+var strToBool;
+var init_string = __esm({
+  "src/utils/common/string.ts"() {
+    strToBool = {
+      /**
+       * 将数组中的所有元素转换为字符串 使用`String`转换
+       * @param arr 需要转换的数组
+       * @returns 转换后的字符串
+       * @example strToBool.array([1, '2']) // ['1', '2']
+       *          strToBool.array(['3', null, undefined, NaN, '']) // ['3']
+       */
+      array: (arr) => arr.map(String).filter((item) => item.length > 0),
+      /**
+       * 排除数组中所有非字符串的元素
+       * @param arr 需要转换的数组
+       * @returns 转换后的字符串
+       * @example strToBool.arrayExcludeNonString(['1', '2', '3']) // ['1', '2', '3']
+       *          strToBool.arrayExcludeNonString(['1', '2', '3', null, undefined, NaN, '']) // ['1', '2', '3']
+       */
+      arrayExcludeNonString: (arr) => arr.filter((item) => typeof item === "string" && item.length > 0),
+      /**
+       * 将字符串转换为布尔值
+       * @param str 需要转换的字符串
+       * @returns 转换后的布尔值
+       * @example strToBool.string('true') // true
+       *          strToBool.string('1') // true
+       *          strToBool.string('yes') // true
+       *          strToBool.string('on') // true
+       *          strToBool.string('false') // false
+       *          strToBool.string('0') // false
+       *          strToBool.string('no') // false
+       */
+      string: (str) => str === "true" || str === "1" || str === "yes" || str === "on",
+      /**
+       * 将字符串转换为数字
+       * @param str 需要转换的字符串
+       * @param defaultValue 默认值 如果非数字 返回默认值
+       * @returns 转换后的数字
+       * @example strToBool.number('1') // 1
+       *          strToBool.number('2') // 2
+       *          strToBool.number('3') // 3
+       *          strToBool.number('abc', 123) // 123
+       */
+      number: (str, defaultValue = 0) => {
+        const num = Number(str);
+        if (typeof num === "number") return num;
+        return defaultValue;
+      },
+      /**
+       * 将字符串数组转换为数字数组
+       * @param arr 需要转换的数组
+       * @returns 转换后的数字数组
+       * @example strToBool.arrayNumber(['1', '2', '3']) // [1, 2, 3]
+       */
+      arrayNumber: (arr) => {
+        const list2 = [];
+        for (const str of arr) {
+          const num = Number(str);
+          if (typeof num === "number") list2.push(num);
+        }
+        return list2;
+      },
+      /**
+       * 传入一个数组 按照索引返回数组 并且将这个数组转换为字符串数组 去掉重复、非字符串的元素
+       * @param arr 需要转换的数组
+       * @param index 需要返回的索引
+       * @returns 转换后的字符串数组
+       * @example strToBool.arrayString(['1', '2', '3'], 0) // ['1']
+       */
+      arrayString: (arr) => {
+        for (const item of arr) {
+          if (!Array.isArray(item)) continue;
+          return strToBool.arrayExcludeNonString(item);
+        }
+        return [];
+      },
+      /**
+       * 合并多个数组为一个并去重 如果不是数组将会跳过
+       * @param arr 需要合并的数组
+       * @returns 合并后的数组
+       * @example strToBool.mergeArray(['1', '2', '3'], ['4', '5', '6']) // ['1', '2', '3', '4', '5', '6']
+       *          strToBool.mergeArray(['4', '5', '6'], ['4', '5', '6']) // ['4', '5', '6']
+       */
+      mergeArray: (...arr) => {
+        const list2 = [];
+        for (const item of arr) {
+          if (!Array.isArray(item)) continue;
+          list2.push(...item);
+        }
+        return [...new Set(list2)];
+      }
+    };
+  }
+});
+
 // src/utils/common/sleep.ts
 var sleep;
 var init_sleep = __esm({
@@ -16333,6 +16461,8 @@ __export(common_exports, {
   getRelPath: () => getRelPath,
   isDir: () => isDir,
   isEven: () => isEven,
+  isNumber: () => isNumber,
+  isNumberInArray: () => isNumberInArray,
   isPlugin: () => isPlugin,
   karinToQQBot: () => karinToQQBot,
   makeForward: () => makeForward,
@@ -16350,6 +16480,7 @@ __export(common_exports, {
   round: () => round,
   sleep: () => sleep,
   splitPath: () => splitPath,
+  strToBool: () => strToBool,
   stream: () => stream,
   updateYaml: () => updateYaml,
   uptime: () => uptime2,
@@ -16366,6 +16497,7 @@ var init_common = __esm({
     init_list();
     init_time();
     init_number();
+    init_string();
     init_sleep();
     init_uptime();
     init_file2();
@@ -16773,6 +16905,7 @@ var init_groups4 = __esm({
     init_fs2();
     init_listeners();
     init_default();
+    init_common();
     init_tools();
     count = createCount();
     getCfg = (keys) => getCacheCfg(dynamicCache, count, keys);
@@ -16790,11 +16923,47 @@ var init_groups4 = __esm({
       return format2(list2);
     };
     format2 = (data) => {
+      const defaultGlobal = defaultConfig.groups[1];
+      const defaultGroup = defaultConfig.groups[0];
+      const userGlobal = data.find((item) => item.key === "global") || defaultGlobal;
+      const userGroup = data.find((item) => item.key === "default") || defaultGroup;
+      const merge = (key, inherit, ...args) => {
+        if (typeof inherit !== "boolean") {
+          inherit = true;
+        }
+        let alias = args.map((item) => item.alias);
+        let enable = args.map((item) => item.enable);
+        let disable = args.map((item) => item.disable);
+        let memberEnable = args.map((item) => item.member_enable);
+        let memberDisable = args.map((item) => item.member_disable);
+        if (inherit && args.length === 3) {
+          alias = [strToBool.mergeArray(alias[0], alias[1]), alias[2]];
+          enable = [strToBool.mergeArray(enable[0], enable[1]), enable[2]];
+          disable = [strToBool.mergeArray(disable[0], disable[1]), disable[2]];
+          memberEnable = [strToBool.mergeArray(memberEnable[0], memberEnable[1]), memberEnable[2]];
+          memberDisable = [strToBool.mergeArray(memberDisable[0], memberDisable[1]), memberDisable[2]];
+        }
+        return {
+          key,
+          inherit,
+          cd: isNumberInArray(args.map((item) => item.cd), 0),
+          userCD: isNumberInArray(args.map((item) => item.userCD), 0),
+          mode: isNumberInArray(args.map((item) => item.mode), 0),
+          alias: strToBool.arrayString(alias),
+          enable: strToBool.arrayString(enable),
+          disable: strToBool.arrayString(disable),
+          member_enable: strToBool.arrayString(memberEnable),
+          member_disable: strToBool.arrayString(memberDisable)
+        };
+      };
+      const global2 = merge("global", true, userGlobal, defaultGlobal);
+      const def = merge("default", true, userGroup, defaultGroup);
       const kv = {
-        default: defaultConfig.groups[0]
+        global: global2,
+        default: def
       };
-      data.forEach((value) => {
-        kv[value.key] = mergeDegAndCfg(kv.default, value);
+      data.forEach((item) => {
+        kv[item.key] = merge(item.key, item.inherit, item, kv.global, kv.default);
       });
       return kv;
     };
@@ -16823,6 +16992,7 @@ var init_groups4 = __esm({
         `Bot:${selfId}:${groupId}`,
         `Bot:${selfId}`,
         groupId,
+        "global",
         "default"
       ];
       return getCfg(keys);
@@ -16834,6 +17004,7 @@ var init_groups4 = __esm({
         `Bot:${selfId}`,
         guildId,
         channelId,
+        "global",
         "default"
       ];
       return getCfg(keys);
@@ -16855,6 +17026,7 @@ var init_privates = __esm({
     init_fs2();
     init_listeners();
     init_default();
+    init_common();
     init_tools();
     count2 = createCount();
     getCfg2 = (keys) => getCacheCfg(dynamicCache2, count2, keys);
@@ -16872,11 +17044,40 @@ var init_privates = __esm({
       return format3(list2);
     };
     format3 = (data) => {
+      const defaultGlobal = defaultConfig.privates[1];
+      const defaultPrivates = defaultConfig.privates[0];
+      const userGlobal = data.find((item) => item.key === "global") || defaultGlobal;
+      const userPrivates = data.find((item) => item.key === "default") || defaultPrivates;
+      const merge = (key, inherit, ...args) => {
+        if (typeof inherit !== "boolean") {
+          inherit = true;
+        }
+        let alias = args.map((item) => item.alias);
+        let enable = args.map((item) => item.enable);
+        let disable = args.map((item) => item.disable);
+        if (inherit && args.length === 3) {
+          alias = [strToBool.mergeArray(alias[0], alias[1]), alias[2]];
+          enable = [strToBool.mergeArray(enable[0], enable[1]), enable[2]];
+          disable = [strToBool.mergeArray(disable[0], disable[1]), disable[2]];
+        }
+        return {
+          key,
+          inherit,
+          cd: isNumberInArray(args.map((item) => item.cd), 0),
+          mode: isNumberInArray(args.map((item) => item.mode), 0),
+          alias: strToBool.arrayString(alias),
+          enable: strToBool.arrayString(enable),
+          disable: strToBool.arrayString(disable)
+        };
+      };
+      const global2 = merge("global", true, userGlobal, defaultGlobal);
+      const def = merge("default", true, userPrivates, defaultPrivates);
       const kv = {
-        default: defaultConfig.privates[0]
+        global: global2,
+        default: def
       };
       data.forEach((value) => {
-        kv[value.key] = mergeDegAndCfg(kv.default, value);
+        kv[value.key] = merge(value.key, value.inherit, value, kv.global, kv.default);
       });
       return kv;
     };
@@ -16897,11 +17098,11 @@ var init_privates = __esm({
     };
     privates = () => dynamicCache2;
     getFriendCfg = (userId, selfId) => {
-      const keys = [`Bot:${selfId}:${userId}`, `Bot:${selfId}`, userId, "default"];
+      const keys = [`Bot:${selfId}:${userId}`, `Bot:${selfId}`, userId, "global", "default"];
       return getCfg2(keys);
     };
     getDirectCfg = (userId, selfId) => {
-      const keys = [`Bot:${selfId}:${userId}`, `Bot:${selfId}`, userId, "default"];
+      const keys = [`Bot:${selfId}:${userId}`, `Bot:${selfId}`, userId, "global", "default"];
       return getCfg2(keys);
     };
     getPrivatesFileData = (dir2) => {

package/dist/start/index.mjs

@@ -1,3 +1,4 @@
+import fs from 'node:fs';
 import net from 'node:net';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -11,7 +12,13 @@ var isClosing = false;
 var minRestartInterval = 5e3;
 var _filename = fileURLToPath(import.meta.url);
 var _dirname = path.dirname(_filename);
-var indexPath = path.join(_dirname, import.meta.url.includes(".mjs") ? "app.mjs" : "app.ts");
+var getMainPath = () => {
+  const filePath = path.join(_dirname, import.meta.url.includes(".mjs") ? "app.mjs" : "app.ts");
+  if (fs.existsSync(filePath)) {
+    return filePath;
+  }
+  return path.join(process.cwd(), "node_modules", "node-karin", "dist", "start", "app.mjs");
+};
 var start = () => {
   if (isStart) {
     console.log("\u5B50\u8FDB\u7A0B\u5DF2\u5728\u8FD0\u884C\u4E2D\uFF0CPID:", child.pid);
@@ -19,7 +26,7 @@ var start = () => {
   }
   isStart = true;
   lastStartTime = Date.now();
-  child = fork(indexPath);
+  child = fork(getMainPath());
   child.on("message", (message) => {
     const { port, type, token } = JSON.parse(message) || {};
     if (type === "restart") {

package/dist/web/assets/js/page-404.tsx-DZHT22u6.js

@@ -0,0 +1 @@
+import{j as t}from"./vendor-react-Hg1DVPZt.js";import{P as r}from"./components-CdSkN0A-.js";import"./vendor-others-B6NXaB-r.js";import"./vendor-editor-B8hjWfkw.js";import"./vendor-ui-utils-5rYIvRjL.js";import"./vendor-heroui-DQJWydu5.js";import"./page-dashboard-aHcz3vqD.js";import"./hooks-DosuTLqt.js";import"./utils-Bla5NKbq.js";import"./vendor-visual-mzxhMYK3.js";const x=()=>t.jsx("div",{className:"min-h-screen flex items-center justify-center",children:t.jsx(r,{})});export{x as default};

package/dist/web/assets/js/{utils-C1_eVtU6.js → utils-Bla5NKbq.js}

@@ -1,2 +1,2 @@
-import{V as p}from"./vendor-react-Hg1DVPZt.js";import{a5 as g}from"./components-AQsFMN7-.js";const k=async(t,n,e,r)=>{const{setIsLogModalOpen:i,setTaskId:c,setTaskLogs:o,setTaskName:f}=n;f("更新插件");const a=["开始创建更新任务...",`options: ${JSON.stringify(t)}`];o(a);try{const s=await g(t);if(s.success&&s.taskId)c(s.taskId),o([...a,`
+import{V as p}from"./vendor-react-Hg1DVPZt.js";import{a5 as g}from"./components-CdSkN0A-.js";const k=async(t,n,e,r)=>{const{setIsLogModalOpen:i,setTaskId:c,setTaskLogs:o,setTaskName:f}=n;f("更新插件");const a=["开始创建更新任务...",`options: ${JSON.stringify(t)}`];o(a);try{const s=await g(t);if(s.success&&s.taskId)c(s.taskId),o([...a,`
 任务创建成功!`,`任务ID: ${s.taskId}`,"正在连接任务执行日志..."]),i(!0),typeof e=="function"&&e(),typeof r=="function"&&r();else throw new Error(s.message||"未知错误")}catch(s){console.error("更新失败:",s),p.error(`更新失败: ${s.message}`)}};export{k as c};

package/dist/web/index.html

@@ -14,17 +14,17 @@
     content="viewport-fit=cover, width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
     name="viewport" />
   <link href="/web/assets/ico/favicon-BoqZd694.ico" rel="icon" />
-  <script type="module" crossorigin src="/web/assets/js/entry-UpjOQl3S.js"></script>
+  <script type="module" crossorigin src="/web/assets/js/entry-Dj9BegRo.js"></script>
   <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-editor-B8hjWfkw.js">
   <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-others-B6NXaB-r.js">
   <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-ui-utils-5rYIvRjL.js">
   <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-react-Hg1DVPZt.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-heroui-BYc15sbq.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/hooks-C1liScQm.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-heroui-DQJWydu5.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/hooks-DosuTLqt.js">
   <link rel="modulepreload" crossorigin href="/web/assets/js/vendor-visual-mzxhMYK3.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/components-AQsFMN7-.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/utils-C1_eVtU6.js">
-  <link rel="modulepreload" crossorigin href="/web/assets/js/page-dashboard-BMR0KJUA.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/components-CdSkN0A-.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/utils-Bla5NKbq.js">
+  <link rel="modulepreload" crossorigin href="/web/assets/js/page-dashboard-aHcz3vqD.js">
   <link rel="stylesheet" crossorigin href="/web/assets/css/vendor-editor-CFbL2ovg.css">
   <link rel="stylesheet" crossorigin href="/web/assets/css/vendor-others-ZgkIHsf0.css">
   <link rel="stylesheet" crossorigin href="/web/assets/css/components-ep7vm38G.css">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "description": "Lightweight, efficient, concise, and stable robot framework.",
   "keywords": [
     "node",

package/dist/web/assets/js/page-404.tsx-vg2MOg_F.js

@@ -1 +0,0 @@
-import{j as t}from"./vendor-react-Hg1DVPZt.js";import{P as r}from"./components-AQsFMN7-.js";import"./vendor-others-B6NXaB-r.js";import"./vendor-editor-B8hjWfkw.js";import"./vendor-ui-utils-5rYIvRjL.js";import"./vendor-heroui-BYc15sbq.js";import"./page-dashboard-BMR0KJUA.js";import"./hooks-C1liScQm.js";import"./utils-C1_eVtU6.js";import"./vendor-visual-mzxhMYK3.js";const x=()=>t.jsx("div",{className:"min-h-screen flex items-center justify-center",children:t.jsx(r,{})});export{x as default};