karin-plugin-mys-core 1.0.0 → 1.0.1

package/lib/apps/MiHoYoLogin.js

@@ -1,15 +1,17 @@
 import {
   UserInfo,
-  common_exports,
   fetchQRcode,
   getCookieAccountInfoByGameToken,
   getTokenByGameToken,
   getUserFullInfo,
   queryQRcode
-} from "../chunk-4JTLXC2G.js";
-import "../chunk-7QISGXVH.js";
+} from "../chunk-MV2UE7C7.js";
+import "../chunk-NHUNEZXM.js";
+import {
+  common_exports
+} from "../chunk-WYRIRWT5.js";
+import "../chunk-CQNW7LJI.js";
 import "../chunk-JML6VYXN.js";
-import "../chunk-JIO4GOQA.js";
 import "../chunk-MLKGABMK.js";
 
 // src/apps/MiHoYoLogin.ts
@@ -170,24 +172,17 @@ var bingCookie = async (userId, cookie, Serv = "mihoyo" /* cn */) => {
   }
   const userInfo = await UserInfo.create(userId);
   await userInfo.saveUserInfo({
-    userId,
     ...uidList.uids.data,
-    ltuids: lodash.uniq([...userInfo.ltuids, cookieParams.ltuid]),
-    stuids: userInfo.stuids,
-    deviceList: userInfo.deviceList
+    ltuids: lodash.uniq([...userInfo.ltuids, cookieParams.ltuid])
   });
-  const ltuidInfo = userInfo.getLtuidInfo(cookieParams.ltuid);
-  await userInfo.saveMysAccountInfo({
-    ltuid: cookieParams.ltuid,
+  await userInfo.saveMysAccountInfo(cookieParams.ltuid, {
     type: uidList.Serv,
-    cookie: common_exports.ObjToStr(cookieParams, ";"),
-    stoken: ltuidInfo?.stoken || "",
-    deviceId: ltuidInfo?.deviceId || ""
+    cookie: common_exports.ObjToStr(cookieParams, ";")
   });
   logger.mark(`[${userId}] \u4FDD\u5B58Cookie\u6210\u529F [ltuid:${cookieParams.ltuid}]`);
   const sendMsg = [];
   lodash.forEach(uidList.uids.data, (uids, game) => {
-    sendMsg.push(`\u3010${uidList.uids.names[game]}\u3011\uFF1A${uids.join("\u3001")}`);
+    sendMsg.push(`\u3010${uidList.uids.names[game]}\u3011\uFF1A${Object.keys(uids).join("\u3001")}`);
   });
   return `Cookie\u7ED1\u5B9A\u6210\u529F\uFF01
 ${sendMsg.join("\n")}`;
@@ -216,18 +211,11 @@ var bingStoken = async (userId, stoken, option) => {
   const Stoken = common_exports.ObjToStr(stokenParams, ";");
   const userInfo = await UserInfo.create(userId);
   await userInfo.saveUserInfo({
-    userId,
-    ltuids: userInfo.ltuids,
-    stuids: lodash.uniq([...userInfo.stuids, stokenParams.stuid]),
-    deviceList: userInfo.deviceList
+    stuids: lodash.uniq([...userInfo.stuids, stokenParams.stuid])
   });
-  const ltuidInfo = userInfo.getLtuidInfo(stokenParams.stuid);
-  await userInfo.saveMysAccountInfo({
-    ltuid: stokenParams.stuid,
+  await userInfo.saveMysAccountInfo(stokenParams.stuid, {
     type: updata.Serv,
-    cookie: ltuidInfo?.cookie || "",
-    stoken: Stoken,
-    deviceId: ltuidInfo?.deviceId || ""
+    stoken: Stoken
   });
   logger.mark(`[${userId}] \u4FDD\u5B58Stoken\u6210\u529F [stuid: ${stokenParams.stuid}]`);
   const sendMsg = [];

package/lib/apps/MysDevice.d.ts

@@ -0,0 +1,5 @@
+import * as node_karin from 'node-karin';
+
+declare const BingMysDevice: node_karin.Command<keyof node_karin.MessageEventMap>;
+
+export { BingMysDevice };

package/lib/apps/MysDevice.js

@@ -0,0 +1,59 @@
+import {
+  DeviceInfo,
+  UserInfo
+} from "../chunk-MV2UE7C7.js";
+import "../chunk-NHUNEZXM.js";
+import "../chunk-WYRIRWT5.js";
+import "../chunk-CQNW7LJI.js";
+import "../chunk-JML6VYXN.js";
+import "../chunk-MLKGABMK.js";
+
+// src/apps/MysDevice.ts
+import karin from "node-karin";
+var BingMysDevice = karin.command(
+  /^#绑定(米游社)?设备$/,
+  async (e) => {
+    const userInfo = await UserInfo.create(e.userId);
+    const ltuidInfoList = userInfo.getLtuidInfoList();
+    const cnLtuidInfoList = ltuidInfoList.filter((info) => info.type === "mihoyo" /* cn */);
+    if (cnLtuidInfoList.length === 0) {
+      if (ltuidInfoList.length === 0) {
+        e.reply("\u6682\u672A\u7ED1\u5B9A\u56FD\u670D\u7C73\u6E38\u793E\u8D26\u53F7\uFF0C\u8BF7\u5148\u201C#\u626B\u7801\u7ED1\u5B9A\u201D\u7ED1\u5B9A", { at: true });
+      } else {
+        e.reply("\u56FD\u9645\u670D\u6682\u4E0D\u9700\u8981\u7ED1\u5B9A\u8BBE\u5907\u3002", { at: true });
+      }
+      return true;
+    }
+    e.reply("\u8BF7\u53D1\u9001\u8BBE\u5907\u4FE1\u606F(\u5EFA\u8BAE\u79C1\u804A\u53D1\u9001)\uFF0C\u6216\u8005\u53D1\u9001\u201C\u53D6\u6D88\u201D\u53D6\u6D88\u7ED1\u5B9A", { at: true });
+    const ctx = await karin.ctx(e);
+    if (/^#?取消(绑定)/.test(ctx.msg)) {
+      e.reply("\u5DF2\u53D6\u6D88\u7ED1\u5B9A", { at: true });
+      return true;
+    }
+    const device = JSON.parse(ctx.msg);
+    if (device.device_id && device.device_fp) {
+      await DeviceInfo.create(userInfo, {
+        deviceId: device.device_id,
+        deviceFp: device.device_fp
+      });
+    } else if (device.deviceName && device.deviceBoard && device.deviceModel && device.oaid && device.androidVersion && device.deviceFingerprint && device.deviceProduct) {
+      await DeviceInfo.create(userInfo, {
+        name: device.deviceName,
+        board: device.deviceBoard,
+        model: device.deviceModel,
+        oaid: device.oaid,
+        androidVersion: device.androidVersion,
+        fingerprint: device.deviceFingerprint,
+        product: device.deviceProduct
+      });
+    } else {
+      e.reply("\u8BBE\u5907\u4FE1\u606F\u4E0D\u5B8C\u6574\uFF0C\u8BF7\u63D0\u4F9B\u5B8C\u6574\u7684\u8BBE\u5907\u4FE1\u606F", { at: true });
+      return true;
+    }
+    e.reply("\u8BBE\u5907\u7ED1\u5B9A\u6210\u529F", { at: true });
+    return true;
+  }
+);
+export {
+  BingMysDevice
+};

package/lib/{base-B1BvQ4ol.d.ts → base-BJv9XnQP.d.ts}

@@ -5,14 +5,29 @@ interface MysAccountInfoType {
     type: MysAccountType;
     cookie: string;
     stoken: string;
-    /** 绑定的设备ID */
-    deviceId: string;
+    /** 绑定的设备md5 */
+    deviceMd5: string;
 }
 declare const enum MysAccountType {
     cn = "mihoyo",
     os = "hoyolab"
 }
 
+interface MysDeviceInfoItem {
+    deviceId: string;
+    deviceFp: string;
+    name: string;
+    board: string;
+    model: string;
+    oaid: string;
+    androidVersion: string;
+    fingerprint: string;
+    product: string;
+}
+interface MysDeviceInfoType extends MysDeviceInfoItem {
+    md5: string;
+}
+
 interface BaseUserInfoType {
     userId: string;
     ltuids: string[];
@@ -38,15 +53,23 @@ declare enum DatabaseType {
 type ModelAttributes<M extends Model = Model, TAttributes = any> = {
     [name in keyof TAttributes]: ModelAttributeColumnOptions<M>;
 };
-type DatabaseReturn<T> = T & {
-    _save: (data: T) => Promise<void>;
-};
-type DatabaseClassInstance<T extends Record<string, any>> = {
+interface DatabaseReturn<T> {
+    [DatabaseType.Db]: T & {
+        save: (data: Partial<T>) => Promise<DatabaseReturn<T>[DatabaseType.Db]>;
+    };
+    [DatabaseType.File]: T & {
+        save: (data: T) => Promise<DatabaseReturn<T>[DatabaseType.File]>;
+    };
+    [DatabaseType.Dir]: T & {
+        save: (data: T) => Promise<DatabaseReturn<T>[DatabaseType.Dir]>;
+    };
+}
+type DatabaseClassInstance<T extends Record<string, any>, D extends DatabaseType> = {
     /** 数据库标识 */
     dialect: Dialect;
     model: ModelStatic<Model>;
     databasePath: string;
-    databaseType: DatabaseType;
+    databaseType: D;
     /** 表名 */
     modelName: string;
     /** 表定义 */
@@ -60,31 +83,29 @@ type DatabaseClassInstance<T extends Record<string, any>> = {
      * @param modelSchema 表定义
      * @param type 数据库类型
      */
-    init(DataDir: string, modelName: string, modelSchema: ModelAttributes<Model>, type: DatabaseType): Promise<DatabaseClassInstance<T>>;
+    init(DataDir: string, modelName: string, modelSchema: Record<keyof T, ModelAttributeColumnOptions<Model>>, type: D): Promise<DatabaseClassInstance<T, D>>;
     /** 将表定义转换为 JSON 对象 */
     schemaToJSON(pk: string): T;
     /** 获取用户数据文件路径 */
     userPath(pk: string): string;
     /** 根据主键读取用户数据文件 */
-    readSync(path: string, pk: string): DatabaseReturn<T>;
+    readSync(path: string, pk: string): DatabaseReturn<T>[DatabaseType.File];
     /** 根据主键读取用户数据目录 */
-    readDirSync(pk: string): DatabaseReturn<T>;
-    /** 写入用户数据文件 */
-    writeFileSync(pk: string, data: Record<string, any>): boolean;
+    readDirSync(pk: string): DatabaseReturn<T>[DatabaseType.Dir];
     /** 写入用户数据目录 */
     writeDirSync(pk: string, data: Record<string, any>): boolean;
     /** 保存用户数据到文件 */
-    saveFile(pk: string): (data: T) => Promise<void>;
+    saveFile(pk: string): (data: T) => Promise<DatabaseReturn<T>[DatabaseType.File]>;
     /** 保存用户数据到目录 */
-    saveDir(pk: string): (data: T) => Promise<void>;
+    saveDir(pk: string): (data: T) => Promise<DatabaseReturn<T>[DatabaseType.Dir]>;
     /** 保存用户数据到 SQL 数据库 */
-    saveSql(model: Model<any, any>, pk: string): (data: T) => Promise<void>;
+    saveSql(model: Model<any, any>, pk: string): (data: Partial<T>) => Promise<DatabaseReturn<T>[DatabaseType.Db]>;
     /** 根据主键查找或创建用户数据 */
-    findByPk(pk: string, create: true): Promise<DatabaseReturn<T>>;
+    findByPk(pk: string, create: true): Promise<DatabaseReturn<T>[D]>;
     /** 根据主键查找用户数据 */
-    findByPk(pk: string, create: boolean): Promise<DatabaseReturn<T> | undefined>;
+    findByPk(pk: string, create?: boolean): Promise<DatabaseReturn<T>[D] | undefined>;
     /** 根据主键数组查找用户数据 */
-    findAllByPks(pks: string[]): Promise<DatabaseReturn<T>[]>;
+    findAllByPks(pks: string[]): Promise<DatabaseReturn<T>[D][]>;
     /** 删除用户数据 */
     destroy(pk: string): Promise<boolean>;
 };
@@ -96,4 +117,4 @@ interface DatabaseClassStatic {
     }): ModelAttributeColumnOptions<Model>;
 }
 
-export { type BaseUserInfoType as B, Dialect as D, type ModelAttributes as M, DatabaseType as a, type DatabaseReturn as b, type DatabaseClassInstance as c, type DatabaseClassStatic as d, type MysAccountInfoType as e, MysAccountType as f };
+export { type BaseUserInfoType as B, Dialect as D, type ModelAttributes as M, DatabaseType as a, type DatabaseReturn as b, type DatabaseClassInstance as c, type DatabaseClassStatic as d, type MysAccountInfoType as e, MysAccountType as f, type MysDeviceInfoItem as g, type MysDeviceInfoType as h };

package/lib/{chunk-JIO4GOQA.js → chunk-CQNW7LJI.js}

@@ -1,3 +1,9 @@
+// src/types/app/command.ts
+var CoreCommand = /* @__PURE__ */ ((CoreCommand2) => {
+  CoreCommand2["BingMysDevice"] = "BingMysDevice";
+  return CoreCommand2;
+})(CoreCommand || {});
+
 // src/types/database/dbs/base.ts
 var Dialect = /* @__PURE__ */ ((Dialect2) => {
   Dialect2["Sqlite"] = "sqlite";
@@ -25,6 +31,7 @@ var MysAccountType = /* @__PURE__ */ ((MysAccountType2) => {
 })(MysAccountType || {});
 
 export {
+  CoreCommand,
   Dialect,
   DatabaseType,
   MysAccountType

package/lib/{chunk-4JTLXC2G.js → chunk-MV2UE7C7.js}

@@ -1,152 +1,11 @@
 import {
   MysAccountInfoDB,
+  MysDeviceInfoDB,
   MysUserInfoDB
-} from "./chunk-7QISGXVH.js";
+} from "./chunk-NHUNEZXM.js";
 import {
-  dir
-} from "./chunk-JML6VYXN.js";
-import {
-  __export
-} from "./chunk-MLKGABMK.js";
-
-// src/utils/common.ts
-var common_exports = {};
-__export(common_exports, {
-  ObjToStr: () => ObjToStr,
-  StrToObj: () => StrToObj,
-  getDeviceGuid: () => getDeviceGuid,
-  getEndOfDay: () => getEndOfDay,
-  random: () => random,
-  randomString: () => randomString,
-  sleep: () => sleep,
-  timef: () => timef
-});
-import lodash from "node-karin/lodash";
-import moment from "node-karin/moment";
-var random = (min, max) => lodash.random(min, max);
-var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-var timef = (format = "YYYY-MM-DD HH:mm:ss") => moment().format(format);
-var getDeviceGuid = () => {
-  function S4() {
-    return ((1 + Math.random()) * 65536 | 0).toString(16).substring(1);
-  }
-  return S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4();
-};
-var randomString = (length, type) => {
-  let str = "0123456789";
-  if (type === "Lower" || type === "All") {
-    str += "abcdefghijklmnopqrstuvwxyz";
-  }
-  if (type === "Upper" || type === "All") {
-    str += "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-  }
-  return lodash.sampleSize(str, length).join("");
-};
-var StrToObj = (Str, sep) => {
-  const strObj = {};
-  Str.split(sep).forEach((item) => {
-    const [key, value] = item.split("=");
-    if (key) {
-      strObj[key] = value || "";
-    }
-  });
-  return strObj;
-};
-var ObjToStr = (obj, sep) => {
-  return Object.entries(obj).filter(([k, v]) => v).map(([k, v]) => `${k}=${v}`).join(sep) + sep;
-};
-var getEndOfDay = () => Number(moment().endOf("day").format("X")) - Number(moment().format("X"));
-
-// src/utils/config.ts
-import {
-  copyConfigSync,
-  logger,
-  requireFileSync,
-  watch,
-  writeJsonSync
-} from "node-karin";
-import lodash2 from "node-karin/lodash";
-var Cfg = new class Cfg2 {
-  #configCache = null;
-  constructor() {
-    copyConfigSync(dir.defConfigDir, dir.ConfigDir, [".json"]);
-    this.loadConfig();
-    watch(`${dir.ConfigDir}/config.json`, () => {
-      logger.info("\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FEE\u6539\uFF0C\u91CD\u65B0\u52A0\u8F7D\u914D\u7F6E");
-      this.loadConfig();
-    });
-  }
-  loadConfig() {
-    const cfg = requireFileSync(`${dir.ConfigDir}/config.json`);
-    const def = requireFileSync(`${dir.defConfigDir}/config.json`);
-    const mergedConfig = this.mergeWithDefaults(cfg, def);
-    this.#configCache = mergedConfig;
-    return mergedConfig;
-  }
-  mergeWithDefaults(userConfig, defaultConfig) {
-    const result = lodash2.merge({}, defaultConfig, userConfig);
-    if (!lodash2.isEqual(result, userConfig)) {
-      try {
-        writeJsonSync(`${dir.ConfigDir}/config.json`, result);
-      } catch (err) {
-        logger.error(err);
-      }
-    }
-    return result;
-  }
-  get(path, isArray = false) {
-    const conf = JSON.parse(JSON.stringify(this.#configCache));
-    const result = lodash2.get(conf, path);
-    if (isArray) {
-      if (!Array.isArray(result)) {
-        logger.error(`\u914D\u7F6E\u8DEF\u5F84 ${path} \u4E0D\u662F\u6570\u7EC4\u7C7B\u578B`);
-        return new EnhancedArray([], path);
-      }
-      return new EnhancedArray(result, path);
-    }
-    return result;
-  }
-  set(path, value) {
-    const conf = JSON.parse(JSON.stringify(this.#configCache));
-    lodash2.set(conf, path, value);
-    this.#configCache = conf;
-    try {
-      writeJsonSync(`${dir.ConfigDir}/config.json`, conf);
-    } catch (err) {
-      logger.error(err);
-    }
-  }
-}();
-var EnhancedArray = class extends Array {
-  #keyPath;
-  constructor(items, path) {
-    super(...items);
-    this.#keyPath = path;
-  }
-  add(element) {
-    this.push(element);
-    Cfg.set(this.#keyPath, this.slice());
-    return this;
-  }
-  remove(predicate, isIndex = false) {
-    let newArr = [];
-    if (isIndex && lodash2.isNumber(predicate)) {
-      if (predicate < 0 || predicate >= this.length) {
-        logger.error(`\u7D22\u5F15 ${predicate} \u8D85\u51FA\u8303\u56F4`);
-        return this;
-      }
-      newArr = [...this.slice(0, predicate), ...this.slice(predicate + 1)];
-    } else if (lodash2.isFunction(predicate)) {
-      newArr = this.filter((item) => !predicate(item));
-    } else {
-      newArr = lodash2.without(this, predicate);
-    }
-    this.length = 0;
-    this.push(...newArr);
-    Cfg.set(this.#keyPath, this.slice());
-    return this;
-  }
-};
+  common_exports
+} from "./chunk-WYRIRWT5.js";
 
 // src/core/api/mysApp.ts
 var version = { cn: "2.70.1", os: "1.5.0" };
@@ -167,9 +26,9 @@ var MysApp = Object.freeze({
 
 // src/core/api/define.ts
 import md5 from "md5";
-import { logger as logger2 } from "node-karin";
+import { logger } from "node-karin";
 import axios, { AxiosHeaders } from "node-karin/axios";
-import lodash3 from "node-karin/lodash";
+import lodash from "node-karin/lodash";
 var DefineMysApi = class {
   uidInfo;
   #apiInfo;
@@ -235,11 +94,11 @@ var DefineMysApi = class {
         response = axios.request(params);
       }
     } catch (err) {
-      logger2.debug(`mys-core-requst[${logger2.green(`${Date.now() - start}ms`)}]: ${JSON.stringify(params, null, 2)}`);
+      logger.debug(`mys-core-requst[${logger.green(`${Date.now() - start}ms`)}]: ${JSON.stringify(params, null, 2)}`);
       return response;
     }
     const res = response.data;
-    logger2.debug(`mys-core-requst[${logger2.green(`${Date.now() - start}ms`)}]: ${JSON.stringify(params, null, 2)} -> ${JSON.stringify(res, null, 2)}`);
+    logger.debug(`mys-core-requst[${logger.green(`${Date.now() - start}ms`)}]: ${JSON.stringify(params, null, 2)} -> ${JSON.stringify(res, null, 2)}`);
     if (!res) {
       return void 0;
     }
@@ -262,7 +121,7 @@ var DefineMysApi = class {
     return `${t},${r},${md5(DS)}`;
   }
   getDS2(saltKey, query = "", body = "") {
-    const r = lodash3.random(100001, 2e5);
+    const r = lodash.random(100001, 2e5);
     const t = Math.floor(Date.now() / 1e3);
     return `${t},${r},${md5(`salt=${MysApp.salt[saltKey]}&t=${t}&r=${r}&b=${body}&q=${query}`)}`;
   }
@@ -400,6 +259,33 @@ var getUserFullInfo = (uidInfo) => new DefineMysApi((self, data) => ({
   HeaderFn: self.CookieHeaders
 }), uidInfo);
 
+// src/core/user/deviceInfo.ts
+import md52 from "md5";
+import lodash2 from "node-karin/lodash";
+var DeviceInfo2 = class {
+  static async get(Md5) {
+    return await MysDeviceInfoDB.findByPk(Md5);
+  }
+  static async create(UserInfo2, deviceInfo) {
+    const deviceMd5 = md52([
+      UserInfo2.userId,
+      deviceInfo.deviceId || "",
+      deviceInfo.name || "",
+      deviceInfo.board || "",
+      deviceInfo.model || "",
+      deviceInfo.oaid || "",
+      deviceInfo.androidVersion || "",
+      deviceInfo.fingerprint || "",
+      deviceInfo.product || ""
+    ].join("_"));
+    const MysDeviceInfo = await MysDeviceInfoDB.findByPk(deviceMd5, true);
+    await MysDeviceInfo.save(deviceInfo);
+    await UserInfo2.saveUserInfo({
+      deviceList: lodash2.uniq([...UserInfo2.deviceList, deviceMd5])
+    });
+  }
+};
+
 // src/core/user/userInfo.ts
 var BaseUserInfo = class {
   userId;
@@ -434,16 +320,22 @@ var BaseUserInfo = class {
   getLtuidInfo(ltuid) {
     return Object.freeze(this.#ltuidMap.get(ltuid));
   }
+  getLtuidInfoList() {
+    return Array.from(this.#ltuidMap.values()).map((info) => Object.freeze(info));
+  }
+  async getDeviceList() {
+    return await MysDeviceInfoDB.findAllByPks(this.#deviceList);
+  }
   async saveUserInfo(data) {
-    await this.UserInfo._save(data);
+    await this.UserInfo.save(data);
   }
-  async saveMysAccountInfo(data) {
-    let MysAccountInfo = this.#ltuidMap.get(data.ltuid);
+  async saveMysAccountInfo(ltuid, data) {
+    let MysAccountInfo = this.#ltuidMap.get(ltuid);
     if (!MysAccountInfo) {
-      MysAccountInfo = await MysAccountInfoDB.findByPk(data.ltuid, true);
+      MysAccountInfo = await MysAccountInfoDB.findByPk(ltuid, true);
     }
-    await MysAccountInfo._save(data);
-    this.#ltuidMap.set(data.ltuid, { ...MysAccountInfo, ...data });
+    await MysAccountInfo.save(data);
+    this.#ltuidMap.set(ltuid, { ...MysAccountInfo, ...data });
   }
 };
 var refreshUidFnMap = /* @__PURE__ */ new Map();
@@ -502,8 +394,6 @@ var UserInfo = class extends BaseUserInfo {
 };
 
 export {
-  common_exports,
-  Cfg,
   MysApp,
   DefineMysApi,
   fetchQRcode,
@@ -514,6 +404,7 @@ export {
   getUserGameRolesByCookie,
   getUserFullInfo,
   MysHosts,
+  DeviceInfo2 as DeviceInfo,
   BaseUserInfo,
   UserInfo
 };

package/lib/{chunk-7QISGXVH.js → chunk-NHUNEZXM.js}

@@ -1,3 +1,6 @@
+import {
+  common_exports
+} from "./chunk-WYRIRWT5.js";
 import {
   dir
 } from "./chunk-JML6VYXN.js";
@@ -27,14 +30,14 @@ var DbBase = class {
   }
   readSync(path3, pk) {
     const result = json.readSync(path3);
-    result._save = this.saveFile(pk);
+    result.save = this.saveFile(pk);
     return result;
   }
   readDirSync(pk) {
     const path3 = this.userPath(pk);
     const files = fs.readdirSync(path3);
     const result = {
-      _save: this.saveDir(pk),
+      save: this.saveDir(pk),
       [this.model.primaryKeyAttribute]: pk
     };
     const filePromises = files.map(async (file) => {
@@ -46,14 +49,6 @@ var DbBase = class {
     });
     return result;
   }
-  writeFileSync(pk, data) {
-    const defData = this.schemaToJSON(pk);
-    for (const key in data) {
-      !(key in defData) && delete data[key];
-    }
-    json.writeSync(this.userPath(pk), lodash.merge({}, defData, data));
-    return true;
-  }
   writeDirSync(pk, data) {
     const path3 = this.userPath(pk);
     lodash.forEach(this.modelSchema, (value, key) => {
@@ -71,23 +66,27 @@ var DbBase = class {
   saveFile(pk) {
     return async (data) => {
       delete data[this.model.primaryKeyAttribute];
-      this.writeFileSync(pk, data);
+      const defData = this.schemaToJSON(pk);
+      const userPath = this.userPath(pk);
+      json.writeSync(userPath, lodash.merge({}, defData, data));
+      return this.readSync(userPath, pk);
     };
   }
   saveDir(pk) {
     return async (data) => {
       delete data[this.model.primaryKeyAttribute];
       this.writeDirSync(pk, data);
+      return this.readDirSync(pk);
     };
   }
   saveSql(model, pk) {
     return async (data) => {
       delete data[this.model.primaryKeyAttribute];
-      const Attributes = this.schemaToJSON(pk);
-      for (const key in data) {
-        !(key in Attributes) && delete data[key];
-      }
-      await model.update(data);
+      const result = await model.update(data);
+      return {
+        ...result.toJSON(),
+        save: this.saveSql(result, pk)
+      };
     };
   }
 };
@@ -155,13 +154,17 @@ var Sqlite3 = class extends DbBase {
           if (this.databaseType === "dir" /* Dir */) {
             fs2.mkdirSync(path3);
             this.writeDirSync(pk, data);
+            return {
+              ...data,
+              save: this.saveDir(pk)
+            };
           } else {
             json2.writeSync(path3, data);
+            return {
+              ...data,
+              save: this.saveFile(pk)
+            };
           }
-          return {
-            ...data,
-            _save: this.saveFile(pk)
-          };
         }
         return void 0;
       }
@@ -178,7 +181,7 @@ var Sqlite3 = class extends DbBase {
       if (!result) return void 0;
       return {
         ...result.toJSON(),
-        _save: this.saveSql(result, pk)
+        save: this.saveSql(result, pk)
       };
     }
   }
@@ -204,7 +207,7 @@ var Sqlite3 = class extends DbBase {
       });
       return result.map((item) => ({
         ...item.toJSON(),
-        _save: this.saveSql(item, item[this.model.primaryKeyAttribute])
+        save: this.saveSql(item, item[this.model.primaryKeyAttribute])
       }));
     }
   }
@@ -323,15 +326,35 @@ var MysAccountInfoDB = await DB.init(
   "db" /* Db */
 );
 
-// src/database/tables/mysUserInfo.ts
+// src/database/tables/mysDeviceInfo.ts
 var DB2 = Database.get();
+var MysDeviceInfoDB = await DB2.init(
+  dir.DataDir,
+  "mysDeviceInfoData",
+  {
+    md5: Database.PkColumn("STRING"),
+    deviceId: Database.Column("STRING", common_exports.getDeviceGuid),
+    deviceFp: Database.Column("STRING", ""),
+    name: Database.Column("STRING", ""),
+    board: Database.Column("STRING", ""),
+    model: Database.Column("STRING", ""),
+    oaid: Database.Column("STRING", ""),
+    androidVersion: Database.Column("STRING", ""),
+    fingerprint: Database.Column("STRING", ""),
+    product: Database.Column("STRING", "")
+  },
+  "db" /* Db */
+);
+
+// src/database/tables/mysUserInfo.ts
+var DB3 = Database.get();
 var BaseMysUserInfoSchema = {
   userId: Database.PkColumn("STRING"),
   ltuids: Database.ArrayColumn("ltuids"),
   stuids: Database.ArrayColumn("stuids"),
   deviceList: Database.ArrayColumn("deviceList")
 };
-var MysUserInfoDB = await DB2.init(
+var MysUserInfoDB = await DB3.init(
   dir.DataDir,
   "mysUserInfoData",
   BaseMysUserInfoSchema,
@@ -342,6 +365,7 @@ export {
   DbBase,
   Database,
   MysAccountInfoDB,
+  MysDeviceInfoDB,
   BaseMysUserInfoSchema,
   MysUserInfoDB
 };

package/lib/chunk-WYRIRWT5.js

@@ -0,0 +1,213 @@
+import {
+  dir
+} from "./chunk-JML6VYXN.js";
+import {
+  __export
+} from "./chunk-MLKGABMK.js";
+
+// src/utils/common.ts
+var common_exports = {};
+__export(common_exports, {
+  ObjToStr: () => ObjToStr,
+  StrToObj: () => StrToObj,
+  getDeviceGuid: () => getDeviceGuid,
+  getEndOfDay: () => getEndOfDay,
+  random: () => random,
+  randomString: () => randomString,
+  sleep: () => sleep,
+  timef: () => timef
+});
+import lodash from "node-karin/lodash";
+import moment from "node-karin/moment";
+var random = (min, max) => lodash.random(min, max);
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var timef = (format = "YYYY-MM-DD HH:mm:ss") => moment().format(format);
+var getDeviceGuid = () => {
+  function S4() {
+    return ((1 + Math.random()) * 65536 | 0).toString(16).substring(1);
+  }
+  return S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4();
+};
+var randomString = (length, type) => {
+  let str = "0123456789";
+  if (type === "Lower" || type === "All") {
+    str += "abcdefghijklmnopqrstuvwxyz";
+  }
+  if (type === "Upper" || type === "All") {
+    str += "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  }
+  return lodash.sampleSize(str, length).join("");
+};
+var StrToObj = (Str, sep) => {
+  const strObj = {};
+  Str.split(sep).forEach((item) => {
+    const [key, value] = item.split("=");
+    if (key) {
+      strObj[key] = value || "";
+    }
+  });
+  return strObj;
+};
+var ObjToStr = (obj, sep) => {
+  return Object.entries(obj).filter(([k, v]) => v).map(([k, v]) => `${k}=${v}`).join(sep) + sep;
+};
+var getEndOfDay = () => Number(moment().endOf("day").format("X")) - Number(moment().format("X"));
+
+// src/utils/config.ts
+import {
+  existsSync,
+  logger,
+  requireFileSync,
+  watch,
+  writeJsonSync
+} from "node-karin";
+import lodash2 from "node-karin/lodash";
+import path from "path";
+var DefaultConfig = {
+  device: {
+    deviceName: "",
+    deviceBoard: "",
+    deviceModel: "",
+    androidVersion: "",
+    deviceFingerprint: "",
+    deviceProduct: ""
+  },
+  commands: {
+    ["BingMysDevice" /* BingMysDevice */]: {
+      cmds: [],
+      end: true,
+      flags: ""
+    }
+  }
+};
+var ConfigPath = path.join(dir.ConfigDir, "config.json");
+var Config = class {
+  /**
+   * @description 配置文件路径
+   */
+  #ConfigPath;
+  /**
+   * @description 默认配置(只读)
+   */
+  #DefaultConfig;
+  /**
+   * @description 配置缓存
+   */
+  #configCache = null;
+  constructor(ConfigPath2, DefaultConfig2) {
+    this.#ConfigPath = ConfigPath2;
+    this.#DefaultConfig = Object.freeze(DefaultConfig2);
+    !existsSync(this.#ConfigPath) && writeJsonSync(this.#ConfigPath, this.#DefaultConfig);
+    this.loadConfig();
+    watch(this.#ConfigPath, () => {
+      logger.info("\u914D\u7F6E\u6587\u4EF6\u5DF2\u4FEE\u6539\uFF0C\u91CD\u65B0\u52A0\u8F7D\u914D\u7F6E");
+      this.loadConfig();
+    });
+  }
+  loadConfig() {
+    const config = requireFileSync(this.#ConfigPath);
+    const mergedConfig = this.mergeWithDefaults(config, this.#DefaultConfig);
+    this.#configCache = mergedConfig;
+    return mergedConfig;
+  }
+  mergeWithDefaults(userConfig, defaultConfig) {
+    const filterUserConfig = (user, defaults) => {
+      if (lodash2.isPlainObject(user) && lodash2.isPlainObject(defaults)) {
+        const filtered = {};
+        for (const key in defaults) {
+          if (Object.prototype.hasOwnProperty.call(user, key)) {
+            filtered[key] = filterUserConfig(user[key], defaults[key]);
+          }
+        }
+        return filtered;
+      }
+      return user;
+    };
+    const filteredUserConfig = filterUserConfig(userConfig, defaultConfig);
+    const result = lodash2.merge({}, defaultConfig, filteredUserConfig);
+    if (!lodash2.isEqual(result, userConfig)) {
+      try {
+        writeJsonSync(this.#ConfigPath, result);
+      } catch (err) {
+        logger.error(err);
+      }
+    }
+    return result;
+  }
+  /**
+  * @description 获取配置路径对应的默认配置
+  */
+  getDef(path2) {
+    const defConfig = JSON.parse(JSON.stringify(this.#DefaultConfig));
+    return lodash2.get(defConfig, path2);
+  }
+  get(path2, isArray = false) {
+    const conf = JSON.parse(JSON.stringify(this.#configCache));
+    const result = lodash2.get(conf, path2);
+    if (isArray) {
+      if (!Array.isArray(result)) {
+        logger.error(`\u914D\u7F6E\u8DEF\u5F84 ${path2} \u4E0D\u662F\u6570\u7EC4\u7C7B\u578B`);
+        return new EnhancedArray([], path2);
+      }
+      return new EnhancedArray(result, path2);
+    }
+    return result;
+  }
+  set(path2, value) {
+    const conf = JSON.parse(JSON.stringify(this.#configCache));
+    lodash2.set(conf, path2, value);
+    this.#configCache = conf;
+    try {
+      writeJsonSync(`${dir.ConfigDir}/config.json`, conf);
+    } catch (err) {
+      logger.error(err);
+    }
+  }
+  /**
+   * @description 获取触发指令正则表达式
+   */
+  getCommand(cmd) {
+    const command = this.get(`commands.${cmd}`);
+    return new RegExp(`^(${command.cmds.join("|")})${command.end ? "$" : ""}`, command.flags);
+  }
+};
+var Cfg = new Config(ConfigPath, DefaultConfig);
+var EnhancedArray = class extends Array {
+  #keyPath;
+  constructor(items, path2) {
+    super(...items);
+    this.#keyPath = path2;
+  }
+  add(element) {
+    if (this.some((item) => lodash2.isEqual(item, element))) {
+      return this;
+    }
+    this.push(element);
+    Cfg.set(this.#keyPath, this.slice());
+    return this;
+  }
+  remove(predicate, isIndex = false) {
+    let newArr = [];
+    if (isIndex && lodash2.isNumber(predicate)) {
+      if (predicate < 0 || predicate >= this.length) {
+        logger.error(`\u7D22\u5F15 ${predicate} \u8D85\u51FA\u8303\u56F4`);
+        return this;
+      }
+      newArr = [...this.slice(0, predicate), ...this.slice(predicate + 1)];
+    } else if (lodash2.isFunction(predicate)) {
+      newArr = this.filter((item) => !predicate(item));
+    } else {
+      newArr = lodash2.without(this, predicate);
+    }
+    this.length = 0;
+    this.push(...newArr);
+    Cfg.set(this.#keyPath, this.slice());
+    return this;
+  }
+};
+
+export {
+  common_exports,
+  Config,
+  Cfg
+};

package/lib/database-byVXw91u.d.ts

@@ -0,0 +1,5 @@
+import { a as DatabaseType, c as DatabaseClassInstance } from './base-BJv9XnQP.js';
+
+type DatabaseFn = <T extends Record<string, any>, D extends DatabaseType>() => DatabaseClassInstance<T, D>;
+
+export type { DatabaseFn as D };

package/lib/{define-CrfHwHnK.d.ts → define-pa_pWNWT.d.ts}

@@ -1,5 +1,9 @@
 import { AxiosHeaders } from 'node-karin/axios';
-import { f as MysAccountType } from './base-B1BvQ4ol.js';
+import { f as MysAccountType } from './base-BJv9XnQP.js';
+
+declare const enum CoreCommand {
+    BingMysDevice = "BingMysDevice"
+}
 
 interface BaseltuidInfo {
     ltuid: string;
@@ -41,7 +45,7 @@ interface UserGameRoleItem {
 
 interface RefreshUidData {
     data: {
-        [key: string]: string[];
+        [key: string]: {};
     };
     names: {
         [key: string]: string;
@@ -53,7 +57,22 @@ interface StokenParms {
     mid: string;
 }
 
-interface Config {
+interface ConfigType {
+    device: DeviceConfig;
+    commands: Record<CoreCommand, CommandItem>;
+}
+interface CommandItem {
+    cmds: string[];
+    end: boolean;
+    flags: string;
+}
+interface DeviceConfig {
+    deviceName: string;
+    deviceBoard: string;
+    deviceModel: string;
+    androidVersion: string;
+    deviceFingerprint: string;
+    deviceProduct: string;
 }
 
 declare const MysApp: Readonly<{
@@ -82,7 +101,7 @@ declare class DefineMysApi<R extends BaseMysRes & Record<string, any> | undefine
     });
     get isHoyolab(): boolean;
     getApi(data: D): Promise<{
-        Method: "POST" | "GET";
+        Method: "GET" | "POST";
         Url: URL;
         Body: any;
         Headers: AxiosHeaders;
@@ -123,11 +142,6 @@ declare class DefineMysApi<R extends BaseMysRes & Record<string, any> | undefine
         query?: string;
         body?: any;
     }) => {
-        'x-rpc-app_version': string;
-        'x-rpc-client_type': string;
-        'x-rpc-language': string;
-        Cookie: string;
-    } | {
         then<TResult1 = {
             'x-rpc-app_version': string;
             'x-rpc-client_type': string;
@@ -157,7 +171,12 @@ declare class DefineMysApi<R extends BaseMysRes & Record<string, any> | undefine
         }>;
         [Symbol.toStringTag]: string;
         Cookie: string;
+    } | {
+        'x-rpc-app_version': string;
+        'x-rpc-client_type': string;
+        'x-rpc-language': string;
+        Cookie: string;
     };
 }
 
-export { type BaseltuidInfo as B, type Config as C, type DeviceInfo as D, type MysApiInfoFn as M, type RefreshUidData as R, type StokenParms as S, type UidInfo as U, type BaseMysRes as a, type UserGameRoleItem as b, DefineMysApi as c, MysApp as d };
+export { type BaseltuidInfo as B, CoreCommand as C, type DeviceInfo as D, type MysApiInfoFn as M, type RefreshUidData as R, type StokenParms as S, type UidInfo as U, type BaseMysRes as a, type UserGameRoleItem as b, type ConfigType as c, type CommandItem as d, type DeviceConfig as e, DefineMysApi as f, MysApp as g };

package/lib/exports/core.d.ts

@@ -1,6 +1,6 @@
-import { c as DefineMysApi, a as BaseMysRes, B as BaseltuidInfo, b as UserGameRoleItem, S as StokenParms, R as RefreshUidData, C as Config } from '../define-CrfHwHnK.js';
-export { d as MysApp } from '../define-CrfHwHnK.js';
-import { B as BaseUserInfoType, b as DatabaseReturn, e as MysAccountInfoType, f as MysAccountType } from '../base-B1BvQ4ol.js';
+import { f as DefineMysApi, a as BaseMysRes, B as BaseltuidInfo, b as UserGameRoleItem, S as StokenParms, R as RefreshUidData, C as CoreCommand, c as ConfigType } from '../define-pa_pWNWT.js';
+export { g as MysApp } from '../define-pa_pWNWT.js';
+import { B as BaseUserInfoType, b as DatabaseReturn, a as DatabaseType, e as MysAccountInfoType, h as MysDeviceInfoType, f as MysAccountType, g as MysDeviceInfoItem } from '../base-BJv9XnQP.js';
 export { dir as CoreDir } from '../dir.js';
 import 'node-karin/axios';
 import 'sequelize';
@@ -116,16 +116,24 @@ declare const MysHosts: Readonly<{
 declare class BaseUserInfo<U extends BaseUserInfoType> {
     #private;
     userId: BaseUserInfoType['userId'];
-    UserInfo: DatabaseReturn<BaseUserInfoType>;
+    UserInfo: DatabaseReturn<BaseUserInfoType>[DatabaseType.Db];
     refresh: () => Promise<this>;
     constructor(userId: string);
     get ltuids(): string[];
     get stuids(): string[];
     get deviceList(): string[];
-    initMysAccountInfo(UserInfo: DatabaseReturn<BaseUserInfoType>): Promise<void>;
-    getLtuidInfo(ltuid: string): Readonly<DatabaseReturn<MysAccountInfoType> | undefined>;
-    saveUserInfo(data: U): Promise<void>;
-    saveMysAccountInfo(data: MysAccountInfoType): Promise<void>;
+    initMysAccountInfo(UserInfo: DatabaseReturn<BaseUserInfoType>[DatabaseType.Db]): Promise<void>;
+    getLtuidInfo(ltuid: string): Readonly<(MysAccountInfoType & {
+        save: (data: Partial<MysAccountInfoType>) => Promise<MysAccountInfoType & /*elided*/ any>;
+    }) | undefined>;
+    getLtuidInfoList(): Readonly<MysAccountInfoType & {
+        save: (data: Partial<MysAccountInfoType>) => Promise<MysAccountInfoType & /*elided*/ any>;
+    }>[];
+    getDeviceList(): Promise<(MysDeviceInfoType & {
+        save: (data: Partial<MysDeviceInfoType>) => Promise<MysDeviceInfoType & /*elided*/ any>;
+    })[]>;
+    saveUserInfo(data: Partial<U>): Promise<void>;
+    saveMysAccountInfo(ltuid: string, data: Partial<MysAccountInfoType>): Promise<void>;
 }
 declare class UserInfo extends BaseUserInfo<BaseUserInfoType> {
     static create(userId: string): Promise<BaseUserInfo<BaseUserInfoType>>;
@@ -144,6 +152,13 @@ declare class UserInfo extends BaseUserInfo<BaseUserInfoType> {
     }>;
 }
 
+declare class DeviceInfo {
+    static get(Md5: string): Promise<(MysDeviceInfoType & {
+        save: (data: Partial<MysDeviceInfoType>) => Promise<MysDeviceInfoType & /*elided*/ any>;
+    }) | undefined>;
+    static create(UserInfo: BaseUserInfo<BaseUserInfoType>, deviceInfo: Partial<MysDeviceInfoItem>): Promise<void>;
+}
+
 /**
  * 生成随机数
  * @param min - 最小值
@@ -203,21 +218,27 @@ declare namespace common {
   export { common_ObjToStr as ObjToStr, common_StrToObj as StrToObj, common_getDeviceGuid as getDeviceGuid, common_getEndOfDay as getEndOfDay, common_random as random, common_randomString as randomString, common_sleep as sleep, common_timef as timef };
 }
 
-declare const Cfg: {
-    "__#1173@#configCache": Config | null;
-    loadConfig(): Config;
-    mergeWithDefaults(userConfig: Record<string, any>, defaultConfig: Record<string, any>): Config;
+declare class Config<C extends Record<string, any>> {
+    #private;
+    constructor(ConfigPath: string, DefaultConfig: C);
+    loadConfig(): C;
+    mergeWithDefaults(userConfig: Record<string, any>, defaultConfig: Record<string, any>): C;
+    /**
+   * @description 获取配置路径对应的默认配置
+   */
+    getDef<T>(path: string): T;
     /**
-     *
-     * @param path 配置路径
-     * @template T 配置类型
      * @description 获取配置路径对应的配置
-     * @returns
      */
-    get<T>(path: string, isArray: false): T;
+    get<T>(path: string, isArray?: false): T;
     get<T>(path: string, isArray: true): EnhancedArray<T>;
     set<T>(path: string, value: T): void;
-};
+    /**
+     * @description 获取触发指令正则表达式
+     */
+    getCommand(cmd: CoreCommand): RegExp;
+}
+declare const Cfg: Config<ConfigType>;
 declare class EnhancedArray<T> extends Array<T> {
     #private;
     constructor(items: T[], path: string);
@@ -225,4 +246,4 @@ declare class EnhancedArray<T> extends Array<T> {
     remove(predicate: T | ((item: T) => boolean), isIndex?: boolean): this;
 }
 
-export { BaseUserInfo, Cfg, DefineMysApi, MysHosts, UserInfo, common, fetchQRcode, getCookieAccountInfoByGameToken, getCookieTokenBySToken, getTokenByGameToken, getUserFullInfo, getUserGameRolesByCookie, queryQRcode };
+export { BaseUserInfo, Cfg, Config, DefineMysApi, DeviceInfo, MysHosts, UserInfo, common, fetchQRcode, getCookieAccountInfoByGameToken, getCookieTokenBySToken, getTokenByGameToken, getUserFullInfo, getUserGameRolesByCookie, queryQRcode };

package/lib/exports/core.js

@@ -1,11 +1,10 @@
 import {
   BaseUserInfo,
-  Cfg,
   DefineMysApi,
+  DeviceInfo,
   MysApp,
   MysHosts,
   UserInfo,
-  common_exports,
   fetchQRcode,
   getCookieAccountInfoByGameToken,
   getCookieTokenBySToken,
@@ -13,18 +12,25 @@ import {
   getUserFullInfo,
   getUserGameRolesByCookie,
   queryQRcode
-} from "../chunk-4JTLXC2G.js";
-import "../chunk-7QISGXVH.js";
+} from "../chunk-MV2UE7C7.js";
+import "../chunk-NHUNEZXM.js";
+import {
+  Cfg,
+  Config,
+  common_exports
+} from "../chunk-WYRIRWT5.js";
+import "../chunk-CQNW7LJI.js";
 import {
   dir
 } from "../chunk-JML6VYXN.js";
-import "../chunk-JIO4GOQA.js";
 import "../chunk-MLKGABMK.js";
 export {
   BaseUserInfo,
   Cfg,
+  Config,
   dir as CoreDir,
   DefineMysApi,
+  DeviceInfo,
   MysApp,
   MysHosts,
   UserInfo,

package/lib/exports/database.d.ts

@@ -1,5 +1,5 @@
-import { D as DatabaseFn } from '../database-BDHrI6Vm.js';
-import { d as DatabaseClassStatic, c as DatabaseClassInstance, a as DatabaseType, M as ModelAttributes, b as DatabaseReturn, e as MysAccountInfoType, B as BaseUserInfoType } from '../base-B1BvQ4ol.js';
+import { D as DatabaseFn } from '../database-byVXw91u.js';
+import { d as DatabaseClassStatic, a as DatabaseType, c as DatabaseClassInstance, M as ModelAttributes, b as DatabaseReturn, e as MysAccountInfoType, h as MysDeviceInfoType, B as BaseUserInfoType } from '../base-BJv9XnQP.js';
 import * as sequelize from 'sequelize';
 import { DataTypes, ModelAttributeColumnOptions, Model, ModelStatic } from 'sequelize';
 
@@ -9,7 +9,7 @@ declare class DatabaseClass {
     /** 设置默认数据库 */
     default(Database: DatabaseFn, Static: DatabaseClassStatic): Promise<void>;
     /** 获取当前使用的数据库 */
-    get<T extends Record<string, any>>(): DatabaseClassInstance<T>;
+    get<T extends Record<string, any>, D extends DatabaseType>(): DatabaseClassInstance<T, D>;
     get PkColumn(): (type: keyof typeof DataTypes, option?: Partial<ModelAttributeColumnOptions<Model>>) => ModelAttributeColumnOptions<Model>;
     get Column(): DatabaseClassStatic['Column'];
     get ArrayColumn(): DatabaseClassStatic['ArrayColumn'];
@@ -17,24 +17,25 @@ declare class DatabaseClass {
 }
 declare const Database: DatabaseClass;
 
-declare class DbBase<T extends Record<string, any>> {
+declare class DbBase<T extends Record<string, any>, D extends DatabaseType> {
     model: ModelStatic<Model>;
     databasePath: string;
-    databaseType: DatabaseType;
+    databaseType: D;
     modelName: string;
     modelSchema: ModelAttributes<Model>;
     schemaToJSON(pk: string): T;
     userPath(pk: string): string;
-    readSync(path: string, pk: string): DatabaseReturn<T>;
-    readDirSync(pk: string): DatabaseReturn<T>;
-    writeFileSync(pk: string, data: Record<string, any>): boolean;
+    readSync(path: string, pk: string): DatabaseReturn<T>[DatabaseType.File];
+    readDirSync(pk: string): DatabaseReturn<T>[DatabaseType.Dir];
     writeDirSync(pk: string, data: Record<string, any>): boolean;
-    saveFile(pk: string): (data: T) => Promise<void>;
-    saveDir(pk: string): (data: T) => Promise<void>;
-    saveSql(model: Model<any, any>, pk: string): (data: T) => Promise<void>;
+    saveFile(pk: string): (data: T) => Promise<DatabaseReturn<T>[DatabaseType.File]>;
+    saveDir(pk: string): (data: T) => Promise<DatabaseReturn<T>[DatabaseType.Dir]>;
+    saveSql(model: Model<any, any>, pk: string): (data: Partial<T>) => Promise<DatabaseReturn<T>[DatabaseType.Db]>;
 }
 
-declare const MysAccountInfoDB: DatabaseClassInstance<MysAccountInfoType>;
+declare const MysAccountInfoDB: DatabaseClassInstance<MysAccountInfoType, DatabaseType.Db>;
+
+declare const MysDeviceInfoDB: DatabaseClassInstance<MysDeviceInfoType, DatabaseType.Db>;
 
 declare const BaseMysUserInfoSchema: {
     userId: sequelize.ModelAttributeColumnOptions<sequelize.Model<any, any>>;
@@ -42,6 +43,6 @@ declare const BaseMysUserInfoSchema: {
     stuids: sequelize.ModelAttributeColumnOptions<sequelize.Model<any, any>>;
     deviceList: sequelize.ModelAttributeColumnOptions<sequelize.Model<any, any>>;
 };
-declare const MysUserInfoDB: DatabaseClassInstance<BaseUserInfoType>;
+declare const MysUserInfoDB: DatabaseClassInstance<BaseUserInfoType, DatabaseType.Db>;
 
-export { BaseMysUserInfoSchema, Database, DbBase, MysAccountInfoDB, MysUserInfoDB };
+export { BaseMysUserInfoSchema, Database, DbBase, MysAccountInfoDB, MysDeviceInfoDB, MysUserInfoDB };

package/lib/exports/database.js

@@ -3,15 +3,18 @@ import {
   Database,
   DbBase,
   MysAccountInfoDB,
+  MysDeviceInfoDB,
   MysUserInfoDB
-} from "../chunk-7QISGXVH.js";
+} from "../chunk-NHUNEZXM.js";
+import "../chunk-WYRIRWT5.js";
+import "../chunk-CQNW7LJI.js";
 import "../chunk-JML6VYXN.js";
-import "../chunk-JIO4GOQA.js";
 import "../chunk-MLKGABMK.js";
 export {
   BaseMysUserInfoSchema,
   Database,
   DbBase,
   MysAccountInfoDB,
+  MysDeviceInfoDB,
   MysUserInfoDB
 };

package/lib/exports/types.d.ts

@@ -1,10 +1,5 @@
-export { a as BaseMysRes, B as BaseltuidInfo, C as Config, D as DeviceInfo, M as MysApiInfoFn, R as RefreshUidData, S as StokenParms, U as UidInfo, b as UserGameRoleItem } from '../define-CrfHwHnK.js';
-export { D as DatabaseFn } from '../database-BDHrI6Vm.js';
-export { B as BaseUserInfoType, c as DatabaseClassInstance, d as DatabaseClassStatic, b as DatabaseReturn, a as DatabaseType, D as Dialect, M as ModelAttributes, e as MysAccountInfoType, f as MysAccountType } from '../base-B1BvQ4ol.js';
+export { a as BaseMysRes, B as BaseltuidInfo, d as CommandItem, c as ConfigType, C as CoreCommand, e as DeviceConfig, D as DeviceInfo, M as MysApiInfoFn, R as RefreshUidData, S as StokenParms, U as UidInfo, b as UserGameRoleItem } from '../define-pa_pWNWT.js';
+export { D as DatabaseFn } from '../database-byVXw91u.js';
+export { B as BaseUserInfoType, c as DatabaseClassInstance, d as DatabaseClassStatic, b as DatabaseReturn, a as DatabaseType, D as Dialect, M as ModelAttributes, e as MysAccountInfoType, f as MysAccountType, g as MysDeviceInfoItem, h as MysDeviceInfoType } from '../base-BJv9XnQP.js';
 import 'node-karin/axios';
 import 'sequelize';
-
-interface MysDeviceInfoType {
-}
-
-export type { MysDeviceInfoType };

package/lib/exports/types.js

@@ -1,10 +1,12 @@
 import {
+  CoreCommand,
   DatabaseType,
   Dialect,
   MysAccountType
-} from "../chunk-JIO4GOQA.js";
+} from "../chunk-CQNW7LJI.js";
 import "../chunk-MLKGABMK.js";
 export {
+  CoreCommand,
   DatabaseType,
   Dialect,
   MysAccountType

package/lib/web.config.js

@@ -1,20 +1,45 @@
+import {
+  Cfg
+} from "./chunk-WYRIRWT5.js";
+import "./chunk-CQNW7LJI.js";
 import {
   dir
 } from "./chunk-JML6VYXN.js";
 import "./chunk-MLKGABMK.js";
 
 // src/web.config.ts
-import { defineConfig } from "node-karin";
+import { components, defineConfig } from "node-karin";
 var web_config_default = defineConfig({
   /** 插件信息配置 */
   info: {
     id: dir.name,
-    name: dir.name,
-    version: dir.version
+    name: "Mihoyo",
+    version: dir.version,
+    description: dir.pkg.description,
+    author: [
+      {
+        name: dir.pkg.author,
+        avatar: "https://github.com/babanbang.png"
+      }
+    ]
   },
   /** 动态渲染的组件 */
   components: () => [
-    // 在这里面 添加各种子组件
+    // 基本调用方法
+    components.accordion.create("accordion-device-key", {
+      label: "\u9ED8\u8BA4\u8BBE\u5907\u4FE1\u606F",
+      children: [
+        components.accordion.createItem("accordion-device-item-key", {
+          title: "\u9ED8\u8BA4\u8BBE\u5907\u4FE1\u606F",
+          subtitle: "\u5982\u679C\u4E0D\u77E5\u9053\u8FD9\u662F\u4EC0\u4E48\u8BF7\u52FF\u4FEE\u6539",
+          children: Object.keys(Cfg.getDef("device")).map((key) => components.input.string(`device-${key}`, {
+            defaultValue: Cfg.get(`device.${key}`),
+            label: key,
+            isRequired: true
+          }))
+        })
+      ]
+    })
   ],
   /** 前端点击保存之后调用的方法 */
   save: (config) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-mys-core",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "babanbang",
   "type": "module",
   "description": "karin-plugin-mys-core",
@@ -60,7 +60,6 @@
   "files": [
     "/lib/**/*.js",
     "/lib/**/*.d.ts",
-    "/config/*.json",
     "!lib/app.js"
   ],
   "publishConfig": {

package/config/config.json

@@ -1,3 +0,0 @@
-{
-  "yiyanApi": "https://api.yujn.cn/api/sjyy.php"
-}

package/lib/database-BDHrI6Vm.d.ts

@@ -1,5 +0,0 @@
-import { c as DatabaseClassInstance } from './base-B1BvQ4ol.js';
-
-type DatabaseFn = <T extends Record<string, any>>() => DatabaseClassInstance<T>;
-
-export type { DatabaseFn as D };