karin-plugin-mys-core 1.0.1 → 1.0.2

package/lib/apps/MiHoYoLogin.js

@@ -1,3 +1,6 @@
+import {
+  ShowBindAccountCmdFunc
+} from "../chunk-JBGXPVO2.js";
 import {
   UserInfo,
   fetchQRcode,
@@ -5,22 +8,53 @@ import {
   getTokenByGameToken,
   getUserFullInfo,
   queryQRcode
-} from "../chunk-MV2UE7C7.js";
-import "../chunk-NHUNEZXM.js";
+} from "../chunk-X75DW4KI.js";
+import "../chunk-3CNBOOKY.js";
+import "../chunk-3BIQN6QA.js";
+import "../chunk-G5W5WAY5.js";
+import "../chunk-7VAWV6ZE.js";
+import "../chunk-LJSDSOY6.js";
+import "../chunk-CFS2WFOO.js";
+import "../chunk-MWYDWDR4.js";
+import "../chunk-FOAQZIZ2.js";
+import "../chunk-IVZICDGW.js";
+import "../chunk-XQWTJIT4.js";
+import "../chunk-7SZX3RBZ.js";
+import "../chunk-W4DBT7AD.js";
+import "../chunk-Z5I6A73Y.js";
+import "../chunk-7WESXE4X.js";
+import "../chunk-KN5SHBVI.js";
+import "../chunk-QMSYS77M.js";
+import "../chunk-SEWEEPJN.js";
+import "../chunk-5NA7ZPDS.js";
+import "../chunk-G547WVGV.js";
+import "../chunk-EMAUATE3.js";
+import "../chunk-Y3J3J5B2.js";
+import "../chunk-7KEG6SDX.js";
+import "../chunk-FBWSEBAW.js";
+import "../chunk-JVJQKRJ4.js";
+import "../chunk-LYTNREAI.js";
+import "../chunk-K5U2O3HH.js";
+import "../chunk-I7XZONDN.js";
+import "../chunk-SHW6FHIB.js";
+import "../chunk-JRH4JC43.js";
+import "../chunk-ARLTXJFJ.js";
 import {
   common_exports
-} from "../chunk-WYRIRWT5.js";
-import "../chunk-CQNW7LJI.js";
-import "../chunk-JML6VYXN.js";
+} from "../chunk-LG34FPBI.js";
+import "../chunk-HVYNK5BN.js";
+import "../chunk-2DHTKQ34.js";
+import "../chunk-SHLPPEAY.js";
+import "../chunk-7YZHHLS5.js";
+import "../chunk-6PIXUPZ6.js";
 import "../chunk-MLKGABMK.js";
 
 // src/apps/MiHoYoLogin.ts
 import karin, { common as karinCommon, logger, segment } from "node-karin";
-import lodash from "node-karin/lodash";
 import QR from "qrcode";
 var QRCodes = /* @__PURE__ */ new Map();
 var MiHoYoLoginQRCode = karin.command(
-  /^#?(扫码|二维码|辅助)(登录|绑定|登陆)$/i,
+  /^#?(扫码|米哈游|mys)(登录|绑定)$/i,
   async (e) => {
     const qrcode = QRCodes.get(e.userId);
     if (qrcode) {
@@ -33,47 +67,49 @@ var MiHoYoLoginQRCode = karin.command(
     }
     QRCodes.set(e.userId, true);
     const device = common_exports.randomString(64, "All");
-    const QRcode = await fetchQRcode().request({ device });
+    const QRcode = (await fetchQRcode.init(null).request({ device })).data;
     if (!QRcode?.data?.url) {
       QRCodes.delete(e.userId);
-      e.reply("\u83B7\u53D6\u4E8C\u7EF4\u7801\u5931\u8D25\u3001\u8BF7\u7A0D\u540E\u518D\u8BD5", { at: true });
+      e.reply("\u83B7\u53D6\u4E8C\u7EF4\u7801\u5931\u8D25\u3001\u8BF7\u7A0D\u540E\u518D\u8BD5...", { at: true });
       return true;
     }
     const image = (await QR.toDataURL(QRcode.data.url)).replace("data:image/png;base64,", "base64://");
     if (!image) {
       QRCodes.delete(e.userId);
-      e.reply("\u751F\u6210\u4E8C\u7EF4\u7801\u5931\u8D25\u3001\u8BF7\u7A0D\u540E\u518D\u8BD5", { at: true });
+      e.reply("\u751F\u6210\u4E8C\u7EF4\u7801\u5931\u8D25\u3001\u8BF7\u7A0D\u540E\u518D\u8BD5...", { at: true });
       return true;
     }
     QRCodes.set(e.userId, image);
     e.reply(["\u8BF7\u4F7F\u7528\u7C73\u6E38\u793E\u626B\u7801\u767B\u5F55", segment.image(image)], { at: true, recallMsg: 60 });
+    setTimeout(() => {
+      QRCodes.delete(e.userId);
+    }, 5 * 60 * 1e3);
     let data, Scanned;
     const ticket = QRcode.data.url.split("ticket=")[1];
     for (let n = 1; n < 60; n++) {
       await karinCommon.sleep(5e3);
       try {
-        const res3 = await queryQRcode().request({ device, ticket });
-        if (!res3) continue;
-        if (res3.retcode === 3503) {
-          e.reply(res3.message, { at: true, recallMsg: 60 });
+        const res = (await queryQRcode.init(null).request({ device, ticket })).data;
+        if (!res) continue;
+        if (res.retcode === 3503) {
           QRCodes.delete(e.userId);
+          e.reply(res.message, { at: true });
           return true;
         }
-        if (res3.retcode !== 0) {
-          e.reply("\u4E8C\u7EF4\u7801\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55", { at: true, recallMsg: 60 });
+        if (res.retcode !== 0) {
           QRCodes.delete(e.userId);
+          e.reply("\u4E8C\u7EF4\u7801\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55", { at: true });
           return true;
         }
-        if (res3.data.stat === "Scanned") {
+        if (res.data.stat === "Scanned") {
           if (Scanned) {
-            e.reply("\u4E8C\u7EF4\u7801\u5DF2\u626B\u63CF\uFF0C\u8BF7\u786E\u8BA4\u767B\u5F55", { at: true, recallMsg: 60 });
+            e.reply("\u4E8C\u7EF4\u7801\u5DF2\u626B\u63CF\uFF0C\u8BF7\u786E\u8BA4\u767B\u5F55", { at: true });
           } else {
             Scanned = true;
             QRCodes.set(e.userId, true);
           }
-        }
-        if (res3.data.stat === "Confirmed") {
-          data = JSON.parse(res3.data.payload.raw);
+        } else if (res.data.stat === "Confirmed") {
+          data = JSON.parse(res.data.payload.raw);
           break;
         }
       } catch (err) {
@@ -81,41 +117,105 @@ var MiHoYoLoginQRCode = karin.command(
         break;
       }
     }
-    if (!data?.uid && !data?.token) {
-      e.reply("\u7C73\u6E38\u793E\u767B\u5F55\u5931\u8D25", { at: true });
+    if (!data?.uid || !data?.token) {
       QRCodes.delete(e.userId);
+      e.reply("\u7C73\u6E38\u793E\u767B\u5F55\u5931\u8D25", { at: true });
       return true;
     }
-    const res = await getTokenByGameToken().request({
+    const Token = (await getTokenByGameToken.init(null).request({
       account_id: parseInt(data.uid),
       game_token: data.token
-    });
-    if (!res) {
-      e.reply("\u83B7\u53D6Token\u5931\u8D25", { at: true });
+    })).data;
+    if (!Token?.data?.token?.token) {
       QRCodes.delete(e.userId);
+      e.reply("\u83B7\u53D6Token\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u3002", { at: true });
       return true;
     }
-    const stoken = `stoken=${res.data.token.token};stuid=${res.data.user_info.aid};mid=${res.data.user_info.mid};`;
-    const res2 = await getCookieAccountInfoByGameToken().request({
+    const stokenParams = {
+      stuid: Token.data.user_info.aid,
+      stoken: Token.data.token.token,
+      mid: Token.data.user_info.mid
+    };
+    const CookieAccountInfo = (await getCookieAccountInfoByGameToken.init(null).request({
       account_id: data.uid,
       game_token: data.token
-    });
-    const cookie = `ltuid=${res.data.user_info.aid};ltoken=${res.data.token.token};cookie_token=${res2.data.cookie_token};account_id=${res.data.user_info.aid}`;
-    const message = await bingStoken(e.userId, stoken, { cookie, Serv: "mihoyo" /* cn */ });
-    e.reply(message, { at: true });
+    })).data;
+    if (!CookieAccountInfo?.data?.cookie_token) {
+      QRCodes.delete(e.userId);
+      e.reply("\u83B7\u53D6CookieToken\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u3002", { at: true });
+      return true;
+    }
+    const cookieParams = {
+      ltuid: stokenParams.stuid,
+      ltoken: stokenParams.stoken,
+      cookie_token: CookieAccountInfo.data.cookie_token,
+      account_id: stokenParams.stuid
+    };
+    const errMsg = await BindStoken(e.userId, stokenParams, { cookieParams, Serv: "mihoyo" /* cn */ });
+    if (errMsg) {
+      e.reply(errMsg, { at: true });
+      return true;
+    }
     QRCodes.delete(e.userId);
-    return true;
+    return await ShowBindAccountCmdFunc(e);
+  }
+);
+var BindCookieByMessage = karin.command(
+  /^#?绑定(米游社)?(cookie|ck)$/i,
+  async (e) => {
+    const cookieMsg = e.msg.replace(/^#?绑定(米游社)?(cookie|ck)/i, "").trim();
+    const cookieObj = common_exports.StrToObj(cookieMsg.replace(/[#'" ]/g, ""), ";");
+    const errMsg = await BindCookie(e.userId, cookieObj, 1 /* CK */);
+    if (errMsg) {
+      e.reply(errMsg, { at: true });
+      return true;
+    }
+    return await ShowBindAccountCmdFunc(e);
   }
 );
-var bingCookie = async (userId, cookie, Serv = "mihoyo" /* cn */) => {
-  const cookieObj = common_exports.StrToObj(cookie.replace(/[#'" ]/g, ""), ";");
+var BindStokenByMessage = karin.command(
+  /^#?绑定(米游社)?(stoken|sk)$/i,
+  async (e) => {
+    const stokenMsg = e.msg.replace(/^#?绑定(米游社)?(stoken|sk)$/i, "").trim();
+    const stokenObj = common_exports.StrToObj(stokenMsg.replace(/[#'" ]/g, ""), ";");
+    if (!stokenObj.stoken || !(stokenObj.stuid || stokenObj.ltuid) || !stokenObj.mid) {
+      e.reply("\u53D1\u9001Stoken\u4E0D\u5B8C\u6574\uFF0C\u5EFA\u8BAE\u4F7F\u7528#\u7C73\u54C8\u6E38\u767B\u5F55", { at: true });
+      return true;
+    }
+    const errMsg = await BindStoken(e.userId, {
+      stuid: stokenObj.stuid || stokenObj.ltuid,
+      stoken: stokenObj.stoken,
+      mid: stokenObj.mid
+    });
+    if (errMsg) {
+      e.reply(errMsg, { at: true });
+      return true;
+    }
+    return await ShowBindAccountCmdFunc(e);
+  }
+);
+var BindStoken = async (userId, stokenParams, option) => {
+  const updata = Object.keys(option?.cookieParams || {}).length > 0 ? { Serv: option.Serv, cookieParams: option.cookieParams, message: "" } : await UserInfo.refreshCookie(stokenParams, option?.Serv ?? ["mihoyo" /* cn */, "hoyolab" /* os */]);
+  if (updata.message) return updata.message;
+  const userInfo = await UserInfo.create(userId);
+  await userInfo.saveUserInfo({
+    stuids: userInfo.stuids.add(stokenParams.stuid, true)
+  });
+  await userInfo.saveMysAccountInfo(stokenParams.stuid, {
+    type: updata.Serv,
+    stoken: common_exports.ObjToStr(stokenParams, ";")
+  });
+  logger.mark(`[${userId}] \u4FDD\u5B58Stoken\u6210\u529F [stuid: ${stokenParams.stuid}]`);
+  const errMsg = await BindCookie(userId, updata.cookieParams, 3 /* CS */, updata.Serv);
+  if (errMsg) return errMsg;
+  return false;
+};
+var BindCookie = async (userId, cookieObj, perm, Serv) => {
   if (!cookieObj.cookie_token && !cookieObj.cookie_token_v2) {
-    return "\u53D1\u9001Cookie\u4E0D\u5B8C\u6574\uFF0C\u5EFA\u8BAE\u4F7F\u7528#\u626B\u7801\u767B\u5F55";
+    return "\u53D1\u9001Cookie\u4E0D\u5B8C\u6574(cookie_token\u7F3A\u5931)\uFF0C\u5EFA\u8BAE\u4F7F\u7528#\u7C73\u54C8\u6E38\u767B\u5F55\u3002";
   }
   const ltuid = cookieObj.ltuid || cookieObj.login_uid || cookieObj.ltuid_v2 || cookieObj.account_id_v2 || cookieObj.ltmid_v2;
-  if (!ltuid) {
-    return "\u53D1\u9001Cookie\u4E0D\u5B8C\u6574\uFF0C\u5EFA\u8BAE\u4F7F\u7528#\u626B\u7801\u767B\u5F55";
-  }
+  if (!ltuid) return "\u53D1\u9001Cookie\u4E0D\u5B8C\u6574\uFF0C\u5EFA\u8BAE\u4F7F\u7528#\u7C73\u54C8\u6E38\u767B\u5F55\u3002";
   let cookieParams = {};
   let flagV2 = false;
   if (cookieObj.cookie_token_v2 && (cookieObj.account_mid_v2 || cookieObj.ltmid_v2)) {
@@ -139,32 +239,37 @@ var bingCookie = async (userId, cookie, Serv = "mihoyo" /* cn */) => {
     cookieParams.mi18nLang = cookieObj.mi18nLang;
   }
   const cookieStr = common_exports.ObjToStr(cookieParams, ";");
-  let uidList = {
-    Serv,
-    uids: { data: {}, names: {} },
-    message: "\u5237\u65B0UID\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\uFF01"
-  };
-  for (const serv of Serv ? [Serv] : ["mihoyo" /* cn */, "hoyolab" /* os */]) {
-    uidList = await UserInfo.refreshUid({
-      type: serv,
-      ltuid,
-      cookie: cookieStr
-    });
-    if (!uidList.message) break;
-  }
-  if (uidList.message) {
-    return uidList.message;
-  }
-  if (flagV2 && isNaN(Number(cookieParams.ltuid))) {
-    const userFullInfo = await getUserFullInfo({
+  const uidList = await (async () => {
+    const errMsg = [];
+    for (const serv of Serv ? [Serv] : ["mihoyo" /* cn */, "hoyolab" /* os */]) {
+      const result = await UserInfo.refreshUid({
+        userId,
+        type: serv,
+        ltuid,
+        cookie: cookieStr,
+        deviceMd5: ""
+      }, perm);
+      if (!result.message) {
+        return result;
+      }
+      errMsg.push(result.message);
+    }
+    return {
+      Serv: Serv || "mihoyo" /* cn */,
+      uids: [],
+      message: errMsg.pop() || ""
+    };
+  })();
+  if (uidList.message) return uidList.message;
+  if (flagV2 && isNaN(+cookieParams.ltuid)) {
+    const userFullInfo = (await getUserFullInfo.init({
       type: uidList.Serv,
       ltuid,
-      cookie: cookieStr
-    }).request({});
-    if (userFullInfo?.data?.user_info) {
-      if (userFullInfo.data.user_info.uid) {
-        cookieParams.ltuid = cookieParams.account_id = userFullInfo.data.user_info.uid;
-      }
+      cookie: cookieStr,
+      deviceMd5: ""
+    }).request(null)).data;
+    if (userFullInfo.data.user_info.uid) {
+      cookieParams.ltuid = cookieParams.account_id = userFullInfo.data.user_info.uid;
     } else {
       logger.mark(`\u7ED1\u5B9ACookie\u9519\u8BEF2\uFF1A${userFullInfo?.message || "Cookie\u9519\u8BEF"}`);
       return `\u7ED1\u5B9ACookie\u5931\u8D25\uFF1A${userFullInfo?.message || "Cookie\u9519\u8BEF"}`;
@@ -172,58 +277,21 @@ var bingCookie = async (userId, cookie, Serv = "mihoyo" /* cn */) => {
   }
   const userInfo = await UserInfo.create(userId);
   await userInfo.saveUserInfo({
-    ...uidList.uids.data,
-    ltuids: lodash.uniq([...userInfo.ltuids, cookieParams.ltuid])
+    ...uidList.uids.reduce((acc, cur) => {
+      acc[cur.columnKey] = cur.data;
+      return acc;
+    }, {}),
+    ltuids: userInfo.ltuids.add(cookieParams.ltuid, true)
   });
   await userInfo.saveMysAccountInfo(cookieParams.ltuid, {
     type: uidList.Serv,
     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${Object.keys(uids).join("\u3001")}`);
-  });
-  return `Cookie\u7ED1\u5B9A\u6210\u529F\uFF01
-${sendMsg.join("\n")}`;
-};
-var bingStoken = async (userId, stoken, option) => {
-  const { cookie = "", Serv = "mihoyo" /* cn */ } = option || {};
-  const stokenObj = common_exports.StrToObj(stoken.replace(/[#'" ]/g, ""), ";");
-  if (!stokenObj.stoken || !(stokenObj.stuid || stokenObj.ltuid) || !stokenObj.mid) {
-    return "\u53D1\u9001Stoken\u4E0D\u5B8C\u6574\uFF0C\u5EFA\u8BAE\u4F7F\u7528#\u626B\u7801\u767B\u5F55";
-  }
-  const stokenParams = {
-    stuid: stokenObj.stuid || stokenObj.ltuid,
-    stoken: stokenObj.stoken,
-    mid: stokenObj.mid
-  };
-  let updata = { Serv, cookie, message: "" };
-  if (!updata.cookie) {
-    for (const serv of Serv ? [Serv] : ["mihoyo" /* cn */, "hoyolab" /* os */]) {
-      updata = await UserInfo.refreshCookie(stokenParams, serv);
-      if (updata.cookie) break;
-    }
-    if (updata.message) {
-      return updata.message;
-    }
-  }
-  const Stoken = common_exports.ObjToStr(stokenParams, ";");
-  const userInfo = await UserInfo.create(userId);
-  await userInfo.saveUserInfo({
-    stuids: lodash.uniq([...userInfo.stuids, stokenParams.stuid])
-  });
-  await userInfo.saveMysAccountInfo(stokenParams.stuid, {
-    type: updata.Serv,
-    stoken: Stoken
-  });
-  logger.mark(`[${userId}] \u4FDD\u5B58Stoken\u6210\u529F [stuid: ${stokenParams.stuid}]`);
-  const sendMsg = [];
-  sendMsg.push(`\u7C73\u6E38\u793EID\uFF1A${stokenParams.stuid}
-Stoken\u7ED1\u5B9A\u6210\u529F\uFF01`);
-  sendMsg.push(await bingCookie(userId, updata.cookie, updata.Serv));
-  return sendMsg.join("\n");
+  return false;
 };
 export {
+  BindCookieByMessage,
+  BindStokenByMessage,
   MiHoYoLoginQRCode
 };

package/lib/apps/MysDevice.d.ts

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

package/lib/apps/MysDevice.js

@@ -1,24 +1,57 @@
 import {
-  DeviceInfo,
   UserInfo
-} from "../chunk-MV2UE7C7.js";
-import "../chunk-NHUNEZXM.js";
-import "../chunk-WYRIRWT5.js";
-import "../chunk-CQNW7LJI.js";
-import "../chunk-JML6VYXN.js";
+} from "../chunk-X75DW4KI.js";
+import {
+  DeviceInfo
+} from "../chunk-3CNBOOKY.js";
+import "../chunk-3BIQN6QA.js";
+import "../chunk-G5W5WAY5.js";
+import "../chunk-7VAWV6ZE.js";
+import "../chunk-LJSDSOY6.js";
+import "../chunk-CFS2WFOO.js";
+import "../chunk-MWYDWDR4.js";
+import "../chunk-FOAQZIZ2.js";
+import "../chunk-IVZICDGW.js";
+import "../chunk-XQWTJIT4.js";
+import "../chunk-7SZX3RBZ.js";
+import "../chunk-W4DBT7AD.js";
+import "../chunk-Z5I6A73Y.js";
+import "../chunk-7WESXE4X.js";
+import "../chunk-KN5SHBVI.js";
+import "../chunk-QMSYS77M.js";
+import "../chunk-SEWEEPJN.js";
+import "../chunk-5NA7ZPDS.js";
+import "../chunk-G547WVGV.js";
+import "../chunk-EMAUATE3.js";
+import "../chunk-Y3J3J5B2.js";
+import "../chunk-7KEG6SDX.js";
+import "../chunk-FBWSEBAW.js";
+import "../chunk-JVJQKRJ4.js";
+import "../chunk-LYTNREAI.js";
+import "../chunk-K5U2O3HH.js";
+import "../chunk-I7XZONDN.js";
+import "../chunk-SHW6FHIB.js";
+import "../chunk-JRH4JC43.js";
+import "../chunk-ARLTXJFJ.js";
+import "../chunk-LG34FPBI.js";
+import "../chunk-HVYNK5BN.js";
+import "../chunk-2DHTKQ34.js";
+import "../chunk-SHLPPEAY.js";
+import "../chunk-7YZHHLS5.js";
+import "../chunk-6PIXUPZ6.js";
 import "../chunk-MLKGABMK.js";
 
 // src/apps/MysDevice.ts
 import karin from "node-karin";
-var BingMysDevice = karin.command(
-  /^#绑定(米游社)?设备$/,
+var BindMysDevice = karin.command(
+  /^#绑定(米游社|mys)?设备$/,
   async (e) => {
     const userInfo = await UserInfo.create(e.userId);
-    const ltuidInfoList = userInfo.getLtuidInfoList();
+    const ltuidInfoList = userInfo.LtuidInfoList;
     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 });
+        e.reply("\u6682\u672A\u7ED1\u5B9A\u56FD\u670D\u7C73\u6E38\u793E\u8D26\u53F7\uFF0C\u8BF7\u5148\u201C#\u7C73\u6E38\u793E\u7ED1\u5B9A\u201D\u8FDB\u884C\u7ED1\u5B9A\uFF01", { at: true });
       } else {
         e.reply("\u56FD\u9645\u670D\u6682\u4E0D\u9700\u8981\u7ED1\u5B9A\u8BBE\u5907\u3002", { at: true });
       }
@@ -26,34 +59,43 @@ var BingMysDevice = karin.command(
     }
     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)) {
+    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, {
+    let deviceMD5 = "";
+    if (device.deviceName && device.deviceBoard && device.deviceModel && device.oaid && device.androidVersion && device.deviceFingerprint && device.deviceProduct) {
+      deviceMD5 = await DeviceInfo.create(e.userId, {
         name: device.deviceName,
         board: device.deviceBoard,
         model: device.deviceModel,
         oaid: device.oaid,
-        androidVersion: device.androidVersion,
+        version: +device.androidVersion,
         fingerprint: device.deviceFingerprint,
-        product: device.deviceProduct
+        product: device.deviceProduct,
+        deviceId: device.device_id || crypto.randomUUID(),
+        deviceFp: device.device_fp || ""
+      });
+    } else if (device.device_id && device.device_fp) {
+      deviceMD5 = await DeviceInfo.create(e.userId, {
+        deviceId: device.device_id,
+        deviceFp: device.device_fp
       });
     } 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;
+    await userInfo.saveUserInfo({
+      deviceList: userInfo.deviceList.add(deviceMD5, true)
+    });
+    return await ShowBindDeviceCmdFuc(e);
   }
 );
+var ShowBindDeviceCmdFuc = async (e) => {
+  e.reply("\u8BBE\u5907\u7ED1\u5B9A\u6210\u529F", { at: true });
+  return true;
+};
 export {
-  BingMysDevice
+  BindMysDevice
 };

package/lib/apps/UIDManage.d.ts

@@ -0,0 +1,10 @@
+import * as node_karin from 'node-karin';
+import { Message } from 'node-karin';
+
+declare const BindUID: node_karin.Command<keyof node_karin.MessageEventMap>;
+declare const UnbindUID: node_karin.Command<keyof node_karin.MessageEventMap>;
+declare const ShowBindAccountCmdFunc: (e: Message) => Promise<boolean>;
+declare const ShowBindAccount: node_karin.Command<keyof node_karin.MessageEventMap>;
+declare const UnbindAccount: node_karin.Command<keyof node_karin.MessageEventMap>;
+
+export { BindUID, ShowBindAccount, ShowBindAccountCmdFunc, UnbindAccount, UnbindUID };

package/lib/apps/UIDManage.js

@@ -0,0 +1,52 @@
+import {
+  BindUID,
+  ShowBindAccount,
+  ShowBindAccountCmdFunc,
+  UnbindAccount,
+  UnbindUID
+} from "../chunk-JBGXPVO2.js";
+import "../chunk-X75DW4KI.js";
+import "../chunk-3CNBOOKY.js";
+import "../chunk-3BIQN6QA.js";
+import "../chunk-G5W5WAY5.js";
+import "../chunk-7VAWV6ZE.js";
+import "../chunk-LJSDSOY6.js";
+import "../chunk-CFS2WFOO.js";
+import "../chunk-MWYDWDR4.js";
+import "../chunk-FOAQZIZ2.js";
+import "../chunk-IVZICDGW.js";
+import "../chunk-XQWTJIT4.js";
+import "../chunk-7SZX3RBZ.js";
+import "../chunk-W4DBT7AD.js";
+import "../chunk-Z5I6A73Y.js";
+import "../chunk-7WESXE4X.js";
+import "../chunk-KN5SHBVI.js";
+import "../chunk-QMSYS77M.js";
+import "../chunk-SEWEEPJN.js";
+import "../chunk-5NA7ZPDS.js";
+import "../chunk-G547WVGV.js";
+import "../chunk-EMAUATE3.js";
+import "../chunk-Y3J3J5B2.js";
+import "../chunk-7KEG6SDX.js";
+import "../chunk-FBWSEBAW.js";
+import "../chunk-JVJQKRJ4.js";
+import "../chunk-LYTNREAI.js";
+import "../chunk-K5U2O3HH.js";
+import "../chunk-I7XZONDN.js";
+import "../chunk-SHW6FHIB.js";
+import "../chunk-JRH4JC43.js";
+import "../chunk-ARLTXJFJ.js";
+import "../chunk-LG34FPBI.js";
+import "../chunk-HVYNK5BN.js";
+import "../chunk-2DHTKQ34.js";
+import "../chunk-SHLPPEAY.js";
+import "../chunk-7YZHHLS5.js";
+import "../chunk-6PIXUPZ6.js";
+import "../chunk-MLKGABMK.js";
+export {
+  BindUID,
+  ShowBindAccount,
+  ShowBindAccountCmdFunc,
+  UnbindAccount,
+  UnbindUID
+};

package/lib/array-CZDr9qst.d.ts

@@ -0,0 +1,62 @@
+declare class Config<C extends Record<string, any>> {
+    #private;
+    /**
+     * @param name 插件名称:配置名称
+     */
+    constructor(name: `${string}:${string}`, ConfigPath: string, DefaultConfig: C, IgnoreConfig: Record<string, any>);
+    loadConfig(): C;
+    mergeWithDefaults(userConfig: Record<string, any>, defaultConfig: Record<string, any>, IgnoreConfig: Record<string, any>): C;
+    /**
+     * @description 获取配置路径对应的默认配置
+     */
+    getDef<T>(path: string): T;
+    /**
+     * @description 获取配置路径对应的配置
+     */
+    get<T>(path: string, isArray?: false, def?: T): T;
+    get<T>(path: string, isArray: true, def?: T[]): EnhancedArray<T>;
+    /**
+     * @param save 是否立即保存
+     */
+    set<T>(path: string, value: T, save: boolean): void;
+    /**
+     * @description 立即保存配置
+     */
+    save(): void;
+    watch(): this;
+}
+
+declare class EnhancedArray<T> extends Array<T> {
+    #private;
+    constructor(cfg: Config<any>, items: T[], path: string);
+    /**
+     * @param element - string | number
+     * @returns
+     */
+    has(element: T & (string | number)): boolean;
+    /**
+     * @param isEqual 是否不添加重复元素
+     * @param save 是否立即保存
+     */
+    add(element: T, isEqual: boolean, save: boolean): this;
+    /**
+     * @param isEqual 是否不添加重复元素
+     * @param save 是否立即保存
+     */
+    addSome(elements: T[], isEqual: boolean, save: boolean): this;
+    /**
+     * @param predicate - 要删除的元素、删除条件函数或索引
+     * @param save - 是否立即保存
+     * @param isIndex - 当 predicate 为数字时，是否将其视为索引
+     */
+    remove(predicate: T & number, save: boolean, isIndex: true): this;
+    remove(predicate: T | ((item: T) => boolean), save: boolean): this;
+    /**
+    * @param predicate - 要删除的元素数组
+    * @param save - 是否立即保存
+    */
+    removeSome(elements: T[], save: boolean): this;
+    clear(): this;
+}
+
+export { Config as C, EnhancedArray as E };

package/lib/chunk-3BIQN6QA.js

@@ -0,0 +1,27 @@
+// src/exports/mys/user/game.ts
+var MysGame = new class MysGame2 {
+  #games = /* @__PURE__ */ new Map();
+  get num() {
+    return this.#games.size;
+  }
+  match(prefix) {
+    if (!prefix || this.#games.size === 0) return void 0;
+    for (const Game of this.#games.values()) {
+      if (Game.prefix.test(prefix)) return Game;
+    }
+    return void 0;
+  }
+  RegisterGame(Game) {
+    this.#games.set(Game.columnKey, Game);
+  }
+  async forEachGame(fn) {
+    if (this.num === 0) return;
+    for (const Game of this.#games.values()) {
+      if (await fn(Game) === "break") break;
+    }
+  }
+}();
+
+export {
+  MysGame
+};