karin-plugin-mys-core 1.0.14 → 1.0.16

package/lib/apps/MiHoYoLogin.js

@@ -1,7 +1,7 @@
 import {
   ShowBindAccountCmdFunc
-} from "../chunk-KJAYW3SO.js";
-import "../chunk-A5FZEOIN.js";
+} from "../chunk-5ZBRGVPY.js";
+import "../chunk-S3ALDDWH.js";
 import {
   UserInfo,
   fetchQRcode,
@@ -9,14 +9,15 @@ import {
   getTokenByGameToken,
   getUserFullInfo,
   queryQRcode
-} from "../chunk-V2MCX7HT.js";
-import "../chunk-IASM5MM5.js";
-import "../chunk-YFMJTWDG.js";
-import "../chunk-SHLPPEAY.js";
+} from "../chunk-F42OUZOV.js";
+import "../chunk-ER4WMJJ6.js";
+import "../chunk-5LRGHP36.js";
+import "../chunk-SXPDBSIW.js";
 import "../chunk-UIPRZFST.js";
 import {
   common_exports
 } from "../chunk-RX4VMVAI.js";
+import "../chunk-SHLPPEAY.js";
 import "../chunk-MLKGABMK.js";
 
 // src/apps/MiHoYoLogin.ts
@@ -226,6 +227,7 @@ var BindCookie = async (userId, cookieObj, perm, Serv) => {
     return {
       Serv: Serv || "mihoyo" /* cn */,
       uids: [],
+      mains: [],
       message: errMsg.pop() || ""
     };
   })();
@@ -249,6 +251,10 @@ var BindCookie = async (userId, cookieObj, perm, Serv) => {
       acc[cur.columnKey] = cur.data;
       return acc;
     }, {}),
+    ...uidList.mains.reduce((acc, cur) => {
+      acc[cur.columnKey] = cur.data;
+      return acc;
+    }, {}),
     ltuids: userInfo.ltuids.add(cookieParams.ltuid, true)
   });
   await userInfo.saveMysAccountInfo(cookieParams.ltuid, {

package/lib/apps/MysDevice.js

@@ -1,12 +1,13 @@
 import {
   DeviceInfo,
   UserInfo
-} from "../chunk-V2MCX7HT.js";
-import "../chunk-IASM5MM5.js";
-import "../chunk-YFMJTWDG.js";
-import "../chunk-SHLPPEAY.js";
+} from "../chunk-F42OUZOV.js";
+import "../chunk-ER4WMJJ6.js";
+import "../chunk-5LRGHP36.js";
+import "../chunk-SXPDBSIW.js";
 import "../chunk-UIPRZFST.js";
 import "../chunk-RX4VMVAI.js";
+import "../chunk-SHLPPEAY.js";
 import "../chunk-MLKGABMK.js";
 
 // src/apps/MysDevice.ts
@@ -19,13 +20,13 @@ var BindMysDevice = karin.command(
     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#\u7C73\u6E38\u793E\u7ED1\u5B9A\u201D\u8FDB\u884C\u7ED1\u5B9A\uFF01", { at: true });
+        e.reply("\u6682\u672A\u7ED1\u5B9A\u56FD\u670D\u7C73\u6E38\u793E\u8D26\u53F7\uFF0C\u8BF7\u5148\u4F7F\u7528 \u201C#\u7C73\u6E38\u793E\u767B\u5F55\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 });
       }
       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 });
+    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 });

package/lib/apps/UIDManage.js

@@ -1,20 +1,23 @@
 import {
   BindUID,
+  ChangeMainUID,
   ShowBindAccount,
   ShowBindAccountCmdFunc,
   UnbindAccount,
   UnbindUID
-} from "../chunk-KJAYW3SO.js";
-import "../chunk-A5FZEOIN.js";
-import "../chunk-V2MCX7HT.js";
-import "../chunk-IASM5MM5.js";
-import "../chunk-YFMJTWDG.js";
-import "../chunk-SHLPPEAY.js";
+} from "../chunk-5ZBRGVPY.js";
+import "../chunk-S3ALDDWH.js";
+import "../chunk-F42OUZOV.js";
+import "../chunk-ER4WMJJ6.js";
+import "../chunk-5LRGHP36.js";
+import "../chunk-SXPDBSIW.js";
 import "../chunk-UIPRZFST.js";
 import "../chunk-RX4VMVAI.js";
+import "../chunk-SHLPPEAY.js";
 import "../chunk-MLKGABMK.js";
 export {
   BindUID,
+  ChangeMainUID,
   ShowBindAccount,
   ShowBindAccountCmdFunc,
   UnbindAccount,

package/lib/{chunk-KJAYW3SO.js → chunk-5ZBRGVPY.js}

@@ -2,11 +2,11 @@ import {
   DefaultLayoutComponent,
   React,
   ReactRender
-} from "./chunk-A5FZEOIN.js";
+} from "./chunk-S3ALDDWH.js";
 import {
   MysGame,
   UserInfo
-} from "./chunk-V2MCX7HT.js";
+} from "./chunk-F42OUZOV.js";
 import {
   dir
 } from "./chunk-SHLPPEAY.js";
@@ -78,19 +78,13 @@ var BindUID = karin.command(
       bindUids[uid] = { perm: 0 /* BIND */, ltuid: "" };
     }
     await userInfo.saveUserInfo({
-      [Game.game + "-main"]: uid,
-      [Game.game + "-uids"]: bindUids
+      [Game.columnKey.main]: uid,
+      [Game.columnKey.uids]: bindUids
     });
     await handler.call(`MYS.${Game.game}.ShowUID`, { e });
     return true;
   }
 );
-var getMainUid = (uid, mainUid, bindUids) => {
-  if (mainUid !== uid) return mainUid;
-  const filterUids = Object.entries(bindUids).filter((value) => value[1].perm !== 4 /* DEL */);
-  if (filterUids.length > 0) return filterUids[0][0];
-  return "";
-};
 var UnbindUID = karin.command(
   /^#?(.*?)(删除|解绑)uid(?:\s*(.+))?$/i,
   async (e, next) => {
@@ -124,10 +118,49 @@ var UnbindUID = karin.command(
       e.reply("UID\u672A\u7ED1\u5B9A\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u65B0\u8F93\u5165\uFF01", { at: true });
       return "break";
     }
+    const getMainUid = (uid2, mainUid2, bindUids2) => {
+      if (mainUid2 !== uid2) return mainUid2;
+      const filterUids = Object.entries(bindUids2).filter((value) => value[1].perm !== 4 /* DEL */);
+      if (filterUids.length > 0) return filterUids[0][0];
+      return "";
+    };
     const mainUid = getMainUid(delUid, userInfo.main_uid, bindUids);
     await userInfo.saveUserInfo({
-      [Game.game + "-main"]: mainUid,
-      [Game.game + "-uids"]: bindUids
+      [Game.columnKey.main]: mainUid,
+      [Game.columnKey.uids]: bindUids
+    });
+    await handler.call(`MYS.${Game.game}.ShowUID`, { e });
+    return true;
+  }
+);
+var ChangeMainUID = karin.command(
+  /^#?(.*?)(切换|更改)uid(?:\s*(.+))?$/i,
+  async (e, next) => {
+    const msgMatch = e.msg.match(/^#?(?<prefix>.*?)(切换|更改)uid(?:\s*(?<idx>.+))?$/i)?.groups;
+    const Game = MysGame.match(msgMatch.prefix?.trim() || "");
+    if (!Game) return next();
+    const uid = msgMatch.idx?.trim();
+    const idx = +uid.split(".")[0];
+    if (isNaN(idx)) {
+      e.reply("\u8BF7\u6B63\u786E\u63D0\u4F9B\u8981\u5207\u6362\u7684\u6E38\u620FUID\u6216\u5E8F\u53F7\uFF01", { at: true });
+      return true;
+    }
+    const userInfo = await Game.UserInfo.create(e.userId);
+    let mainUid = uid;
+    const bindUids = userInfo.bind_uids;
+    if (idx <= 1e4) {
+      const filterUids = Object.entries(bindUids).filter((value) => value[1].perm !== 4 /* DEL */);
+      if (idx > filterUids.length || idx <= 0) {
+        e.reply("UID\u5E8F\u53F7\u4E0D\u5B58\u5728\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u65B0\u8F93\u5165\uFF01", { at: true });
+        return true;
+      }
+      mainUid = filterUids[idx - 1][0];
+    } else if (!bindUids[mainUid] || bindUids[mainUid].perm === 4 /* DEL */) {
+      e.reply("UID\u672A\u7ED1\u5B9A\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u65B0\u8F93\u5165\uFF01", { at: true });
+      return true;
+    }
+    await userInfo.saveUserInfo({
+      [Game.columnKey.main]: mainUid
     });
     await handler.call(`MYS.${Game.game}.ShowUID`, { e });
     return true;
@@ -161,10 +194,7 @@ var ShowBindAccountCmdFunc = async (e) => {
         const gameUserInfo = await Game.UserInfo.create(e.userId);
         data.bindUids.push({
           gameName: Game.name,
-          uids: Object.entries(gameUserInfo.bind_uids).filter(([, info]) => info.ltuid === ltuidInfo.ltuid).map(([uid, info]) => ({
-            uid,
-            perm: info.perm
-          }))
+          uids: Object.entries(gameUserInfo.bind_uids).filter(([, info]) => info.ltuid === ltuidInfo.ltuid).map(([uid, info]) => ({ uid, perm: info.perm }))
         });
       });
       renderData.AccountList.push(data);
@@ -228,6 +258,7 @@ var UnbindAccount = karin.command(
 export {
   BindUID,
   UnbindUID,
+  ChangeMainUID,
   ShowBindAccountCmdFunc,
   ShowBindAccount,
   UnbindAccount

package/lib/{chunk-V2MCX7HT.js → chunk-F42OUZOV.js}

@@ -2,16 +2,16 @@ import {
   MysAccountInfoDB,
   MysDeviceInfoDB,
   MysUserInfoDB
-} from "./chunk-IASM5MM5.js";
+} from "./chunk-ER4WMJJ6.js";
 import {
   DeviceCfg
-} from "./chunk-YFMJTWDG.js";
-import {
-  dir
-} from "./chunk-SHLPPEAY.js";
+} from "./chunk-SXPDBSIW.js";
 import {
   common_exports
 } from "./chunk-RX4VMVAI.js";
+import {
+  dir
+} from "./chunk-SHLPPEAY.js";
 
 // src/exports/mys/api/apis.ts
 import lodash2 from "node-karin/lodash";
@@ -119,7 +119,7 @@ var MysGame = new class MysGame2 {
     return void 0;
   }
   RegisterGame(Game) {
-    this.#games.set(Game.columnKey, Game);
+    this.#games.set(Game.game, Game);
   }
   async forEachGame(fn) {
     if (this.num === 0) return;
@@ -130,7 +130,6 @@ var MysGame = new class MysGame2 {
 }();
 var RegisterGameBase = class {
   game;
-  columnKey;
   /** @description 游戏名称 */
   name;
   /** @description 指令前缀 */
@@ -139,12 +138,17 @@ var RegisterGameBase = class {
   UserInfo;
   constructor(game, name, prefixs, userInfo, refreshFuc) {
     this.game = game;
-    this.columnKey = `${game}-uids`;
     this.name = name;
     this.prefixs = prefixs;
     this.UserInfo = userInfo;
     this.refresh = refreshFuc;
   }
+  get columnKey() {
+    return {
+      uids: `${this.game}-uids`,
+      main: `${this.game}-main`
+    };
+  }
   get prefix() {
     return new RegExp(`^(${this.prefixs.join("|")})$`, "i");
   }
@@ -219,6 +223,7 @@ var UserInfo = class _UserInfo extends BaseUserInfo {
   static async refreshUid(options, perm) {
     let message = "";
     const uids = [];
+    const mains = [];
     if (MysGame.num > 0) {
       const res = (await (await getUserGameRolesByCookie.initDevice(options)).request(null)).data;
       if (res?.retcode === 0) {
@@ -244,9 +249,16 @@ var UserInfo = class _UserInfo extends BaseUserInfo {
           });
           uids.push({
             name: Game.name,
-            columnKey: Game.columnKey,
+            columnKey: Game.columnKey.uids,
             data: bindUids
           });
+          if (!userInfo.main_uid || !bindUids[userInfo.main_uid]) {
+            mains.push({
+              name: Game.name,
+              columnKey: Game.columnKey.main,
+              data: Array.from(uidList)[0] || ""
+            });
+          }
         });
       } else if (res?.retcode === -100) {
         message = "Cookie\u5DF2\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0#\u626B\u7801\u767B\u5F55\u6216#\u5237\u65B0Cookie\uFF01";
@@ -257,6 +269,7 @@ var UserInfo = class _UserInfo extends BaseUserInfo {
     return {
       Serv: options.type,
       uids,
+      mains,
       message
     };
   }

package/lib/core/index.js

@@ -1,10 +1,11 @@
+import "../chunk-5LRGHP36.js";
 import {
   CoreCfg,
   DeviceCfg
-} from "../chunk-YFMJTWDG.js";
-import "../chunk-SHLPPEAY.js";
+} from "../chunk-SXPDBSIW.js";
 import "../chunk-UIPRZFST.js";
 import "../chunk-RX4VMVAI.js";
+import "../chunk-SHLPPEAY.js";
 import "../chunk-MLKGABMK.js";
 export {
   CoreCfg,

package/lib/exports/database/index.js

@@ -14,9 +14,9 @@ import {
   Table,
   UidPermission,
   createTable
-} from "../../chunk-IASM5MM5.js";
-import "../../chunk-SHLPPEAY.js";
+} from "../../chunk-ER4WMJJ6.js";
 import "../../chunk-RX4VMVAI.js";
+import "../../chunk-SHLPPEAY.js";
 import "../../chunk-MLKGABMK.js";
 export {
   Database,

package/lib/exports/mys/index.d.ts

@@ -272,7 +272,6 @@ declare const MysGame: {
 };
 declare class RegisterGameBase<GameUserInfoTableType extends BaseUserInfoTableType> {
     game: string;
-    columnKey: `${string}-uids`;
     /** @description 游戏名称 */
     name: gameName;
     /** @description 指令前缀 */
@@ -286,6 +285,10 @@ declare class RegisterGameBase<GameUserInfoTableType extends BaseUserInfoTableTy
         userId: string;
         cookie: string;
     } & BaseltuidInfoType) => Promise<string[]>);
+    get columnKey(): {
+        uids: `${string}-uids`;
+        main: `${string}-main`;
+    };
     get prefix(): RegExp;
 }
 
@@ -374,6 +377,11 @@ interface RefreshUidResultType {
         columnKey: `${string}-uids`;
         data: BaseGameUIDInfoTableType<string>[`${string}-uids`];
     }[];
+    mains: {
+        name: string;
+        columnKey: `${string}-main`;
+        data: string;
+    }[];
     message: string;
 }
 

package/lib/exports/mys/index.js

@@ -15,12 +15,13 @@ import {
   getUserFullInfo,
   getUserGameRolesByCookie,
   queryQRcode
-} from "../../chunk-V2MCX7HT.js";
-import "../../chunk-IASM5MM5.js";
-import "../../chunk-YFMJTWDG.js";
-import "../../chunk-SHLPPEAY.js";
+} from "../../chunk-F42OUZOV.js";
+import "../../chunk-ER4WMJJ6.js";
+import "../../chunk-5LRGHP36.js";
+import "../../chunk-SXPDBSIW.js";
 import "../../chunk-UIPRZFST.js";
 import "../../chunk-RX4VMVAI.js";
+import "../../chunk-SHLPPEAY.js";
 import "../../chunk-MLKGABMK.js";
 export {
   BaseUserInfo,

package/lib/exports/render/index.js

@@ -2,9 +2,9 @@ import {
   DefaultLayoutComponent,
   React,
   ReactRender
-} from "../../chunk-A5FZEOIN.js";
-import "../../chunk-SHLPPEAY.js";
+} from "../../chunk-S3ALDDWH.js";
 import "../../chunk-RX4VMVAI.js";
+import "../../chunk-SHLPPEAY.js";
 import "../../chunk-MLKGABMK.js";
 export {
   DefaultLayoutComponent,

package/lib/web.config.d.ts

@@ -0,0 +1,10 @@
+import * as node_karin from 'node-karin';
+
+type ConfigSaveEntry = {
+    githubProxyUrl: string;
+};
+declare const _default: node_karin.DefineConfig<{
+    "accordion-config-key": ConfigSaveEntry[];
+}>;
+
+export { _default as default };

package/lib/web.config.js

@@ -0,0 +1,142 @@
+import {
+  CoreCfg,
+  DeviceCfg
+} from "./chunk-SXPDBSIW.js";
+import "./chunk-UIPRZFST.js";
+import "./chunk-RX4VMVAI.js";
+import {
+  dir
+} from "./chunk-SHLPPEAY.js";
+import "./chunk-MLKGABMK.js";
+
+// src/web.config.ts
+import { components, defineConfig, logger } from "node-karin";
+import lodash from "node-karin/lodash";
+var FormatValue = (key, value) => {
+  const { format } = key.match(/=(?<format>.*)$/)?.groups || {};
+  switch (format) {
+    case "int":
+      return { key: key.replace(/=(.*)$/, "").replace(/-/g, "."), value: parseInt(value) };
+    case "float":
+      return { key: key.replace(/=(.*)$/, "").replace(/-/g, "."), value: parseFloat(value) };
+    default:
+      return { key: key.replace(/-/g, "."), value };
+  }
+};
+var web_config_default = defineConfig({
+  /** 插件信息配置 */
+  info: {
+    id: dir.name,
+    name: "Mys-Core",
+    version: dir.version,
+    description: dir.pkg.description,
+    author: [
+      {
+        name: dir.pkg.author,
+        avatar: "https://github.com/babanbang.png"
+      }
+    ]
+  },
+  /** 动态渲染的组件 */
+  components: () => [
+    components.accordion.create("accordion-config-key" /* Config */, {
+      label: "\u57FA\u7840\u8BBE\u7F6E",
+      children: [
+        components.accordion.createItem("accordion-githubProxy-item-key", {
+          title: "GitHub \u4EE3\u7406\u8BBE\u7F6E",
+          subtitle: "\u7528\u4E8E\u4E0B\u8F7D\u63D2\u4EF6\u8D44\u6E90",
+          children: [
+            components.input.url("githubProxyUrl", {
+              label: "GitHub \u4EE3\u7406\u5730\u5740",
+              defaultValue: CoreCfg.get("githubProxyUrl")
+            })
+          ]
+        })
+      ]
+    }),
+    components.divider.horizontal("divider-config-end"),
+    components.accordion.create("accordion-device-key" /* Device */, {
+      label: "\u7C73\u6E38\u793E\u8BBE\u5907\u4FE1\u606F\u8BBE\u7F6E",
+      children: [
+        components.accordion.createItem("accordion-device-item-key", {
+          title: "\u5982\u679C\u4E0D\u77E5\u9053\u8FD9\u662F\u4EC0\u4E48\u8BF7\u52FF\u4FEE\u6539",
+          subtitle: "-- \u9ED8\u8BA4\u8BBE\u5907\u4FE1\u606F --",
+          className: "ml-4 mr-4",
+          children: [
+            components.input.number("version=int", {
+              defaultValue: DeviceCfg.get("version") + "",
+              label: "androidVersion",
+              rules: [
+                { max: 15, min: 10 }
+              ],
+              isRequired: true
+            }),
+            components.input.string("name", {
+              defaultValue: DeviceCfg.get("name"),
+              label: "deviceName",
+              isRequired: true
+            }),
+            components.input.string("board", {
+              defaultValue: DeviceCfg.get("board"),
+              label: "deviceBoard",
+              isRequired: true
+            }),
+            components.input.string("model", {
+              defaultValue: DeviceCfg.get("model"),
+              label: "deviceModel",
+              isRequired: true
+            }),
+            components.input.string("product", {
+              defaultValue: DeviceCfg.get("product"),
+              label: "deviceProduct",
+              isRequired: true
+            }),
+            components.input.string("fingerprint", {
+              defaultValue: DeviceCfg.get("fingerprint"),
+              label: "deviceFingerprint",
+              className: "w-full",
+              isRequired: true
+            })
+          ]
+        })
+      ]
+    })
+  ],
+  /** 前端点击保存之后调用的方法 */
+  save: (changeConfig) => {
+    const CfgMap = {
+      ["accordion-config-key" /* Config */]: CoreCfg,
+      ["accordion-device-key" /* Device */]: DeviceCfg
+    };
+    try {
+      lodash.forEach(changeConfig, (childrenValue, accordionKey) => {
+        switch (accordionKey) {
+          case "accordion-config-key" /* Config */:
+          case "accordion-device-key" /* Device */: {
+            childrenValue.forEach((children) => {
+              lodash.forEach(children, (value, childrenKey) => {
+                const { key, value: formatValue } = FormatValue(childrenKey, value);
+                CfgMap[accordionKey].set(key, formatValue, false);
+              });
+            });
+            break;
+          }
+        }
+      });
+      Object.values(CfgMap).forEach((cfg) => cfg.save());
+    } catch (err) {
+      logger.error(err);
+      return {
+        success: false,
+        message: "\u4FDD\u5B58\u5931\u8D25\uFF1A" + err.message
+      };
+    }
+    return {
+      success: true,
+      message: "\u4FDD\u5B58\u6210\u529F"
+    };
+  }
+});
+export {
+  web_config_default as default
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-mys-core",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "author": "babanbang",
   "type": "module",
   "description": "karin-plugin-mys-core",

package/lib/{chunk-IASM5MM5.js → chunk-ER4WMJJ6.js}

@@ -1,9 +1,9 @@
-import {
-  dir
-} from "./chunk-SHLPPEAY.js";
 import {
   common_exports
 } from "./chunk-RX4VMVAI.js";
+import {
+  dir
+} from "./chunk-SHLPPEAY.js";
 
 // src/exports/database/database.ts
 import { logger as logger4 } from "node-karin";

package/lib/{chunk-A5FZEOIN.js → chunk-S3ALDDWH.js}

@@ -1,9 +1,9 @@
-import {
-  dir
-} from "./chunk-SHLPPEAY.js";
 import {
   common_exports
 } from "./chunk-RX4VMVAI.js";
+import {
+  dir
+} from "./chunk-SHLPPEAY.js";
 
 // src/exports/render/index.ts
 import React3 from "react";

package/lib/{chunk-YFMJTWDG.js → chunk-SXPDBSIW.js}

@@ -1,9 +1,9 @@
-import {
-  dir
-} from "./chunk-SHLPPEAY.js";
 import {
   Config
 } from "./chunk-UIPRZFST.js";
+import {
+  dir
+} from "./chunk-SHLPPEAY.js";
 
 // src/core/config/config.ts
 var defaultConfig = {