karin-plugin-mys-core 1.0.16 → 1.0.20

package/lib/apps/MiHoYoLogin.js

@@ -1,6 +1,6 @@
 import {
   ShowBindAccountCmdFunc
-} from "../chunk-5ZBRGVPY.js";
+} from "../chunk-SOLISSTT.js";
 import "../chunk-S3ALDDWH.js";
 import {
   UserInfo,
@@ -9,11 +9,11 @@ import {
   getTokenByGameToken,
   getUserFullInfo,
   queryQRcode
-} from "../chunk-F42OUZOV.js";
-import "../chunk-ER4WMJJ6.js";
+} from "../chunk-32QZ2PSX.js";
 import "../chunk-5LRGHP36.js";
-import "../chunk-SXPDBSIW.js";
-import "../chunk-UIPRZFST.js";
+import "../chunk-HI6OZTI2.js";
+import "../chunk-BLE3V6QR.js";
+import "../chunk-ER4WMJJ6.js";
 import {
   common_exports
 } from "../chunk-RX4VMVAI.js";

package/lib/apps/MysDevice.js

@@ -1,11 +1,11 @@
 import {
   DeviceInfo,
   UserInfo
-} from "../chunk-F42OUZOV.js";
-import "../chunk-ER4WMJJ6.js";
+} from "../chunk-32QZ2PSX.js";
 import "../chunk-5LRGHP36.js";
-import "../chunk-SXPDBSIW.js";
-import "../chunk-UIPRZFST.js";
+import "../chunk-HI6OZTI2.js";
+import "../chunk-BLE3V6QR.js";
+import "../chunk-ER4WMJJ6.js";
 import "../chunk-RX4VMVAI.js";
 import "../chunk-SHLPPEAY.js";
 import "../chunk-MLKGABMK.js";

package/lib/apps/UIDManage.js

@@ -5,13 +5,13 @@ import {
   ShowBindAccountCmdFunc,
   UnbindAccount,
   UnbindUID
-} from "../chunk-5ZBRGVPY.js";
+} from "../chunk-SOLISSTT.js";
 import "../chunk-S3ALDDWH.js";
-import "../chunk-F42OUZOV.js";
-import "../chunk-ER4WMJJ6.js";
+import "../chunk-32QZ2PSX.js";
 import "../chunk-5LRGHP36.js";
-import "../chunk-SXPDBSIW.js";
-import "../chunk-UIPRZFST.js";
+import "../chunk-HI6OZTI2.js";
+import "../chunk-BLE3V6QR.js";
+import "../chunk-ER4WMJJ6.js";
 import "../chunk-RX4VMVAI.js";
 import "../chunk-SHLPPEAY.js";
 import "../chunk-MLKGABMK.js";

package/lib/{chunk-F42OUZOV.js → chunk-32QZ2PSX.js}

@@ -1,11 +1,11 @@
+import {
+  DeviceCfg
+} from "./chunk-HI6OZTI2.js";
 import {
   MysAccountInfoDB,
   MysDeviceInfoDB,
   MysUserInfoDB
 } from "./chunk-ER4WMJJ6.js";
-import {
-  DeviceCfg
-} from "./chunk-SXPDBSIW.js";
 import {
   common_exports
 } from "./chunk-RX4VMVAI.js";

package/lib/{chunk-UIPRZFST.js → chunk-BLE3V6QR.js}

@@ -132,30 +132,25 @@ var Config = class {
     }
     return result;
   }
-  /**
-   * @description 获取配置路径对应的默认配置
-   */
   getDef(path2) {
     const defConfig = JSON.parse(JSON.stringify(this.#DefaultConfig));
-    return lodash2.get(defConfig, path2);
+    return path2 ? lodash2.get(defConfig, path2) : defConfig;
   }
   get(path2, isArray = false, def) {
     const conf = JSON.parse(JSON.stringify(this.#ConfigCache));
-    const result = path2 ? lodash2.get(conf, path2, def) : conf;
+    const pathStr = String(path2);
+    const result = pathStr ? lodash2.get(conf, pathStr, def) : conf;
     if (isArray) {
       if (!Array.isArray(result)) {
-        logger2.error(`\u914D\u7F6E\u8DEF\u5F84 ${path2} \u4E0D\u662F\u6570\u7EC4\u7C7B\u578B`);
-        return new EnhancedArray(this, [], path2);
+        logger2.error(`\u914D\u7F6E\u8DEF\u5F84 ${pathStr} \u4E0D\u662F\u6570\u7EC4\u7C7B\u578B`);
+        return new EnhancedArray(this, [], pathStr);
       }
-      return new EnhancedArray(this, result, path2);
+      return new EnhancedArray(this, result, pathStr);
     }
     return result;
   }
-  /**
-   * @param save 是否立即保存
-   */
   set(path2, value, save) {
-    lodash2.set(this.#ConfigCache, path2, value);
+    lodash2.set(this.#ConfigCache, String(path2), value);
     save && this.save();
   }
   /**

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

@@ -1,16 +1,19 @@
 import {
   Config
-} from "./chunk-UIPRZFST.js";
+} from "./chunk-BLE3V6QR.js";
 import {
   dir
 } from "./chunk-SHLPPEAY.js";
 
 // src/core/config/config.ts
-var defaultConfig = {
-  githubProxyUrl: "https://gh-proxy.org"
+var defaultCoreConfig = {
+  proxy: {
+    github: "https://gh-proxy.org",
+    ["hoyolab" /* os */]: ""
+  }
 };
 var defaultConfigDefine = {};
-var CoreCfg = new Config(`${dir.name}:config`, dir.ConfigDir, defaultConfig, defaultConfigDefine).watch();
+var CoreCfg = new Config(`${dir.name}:config`, dir.ConfigDir, defaultCoreConfig, defaultConfigDefine).watch();
 
 // src/core/config/device.ts
 var DefaultDevice = {

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

@@ -6,7 +6,7 @@ import {
 import {
   MysGame,
   UserInfo
-} from "./chunk-F42OUZOV.js";
+} from "./chunk-32QZ2PSX.js";
 import {
   dir
 } from "./chunk-SHLPPEAY.js";

package/lib/core/index.d.ts

@@ -1,7 +1,11 @@
 import { Config } from '../exports/config/index.js';
+import { M as MysAccountType } from '../mysAccountInfo-B7u5Sl8f.js';
 
 interface DefaultCoreConfigType {
-    githubProxyUrl: string;
+    proxy: {
+        github: string;
+        [MysAccountType.os]: string;
+    };
 }
 interface DefaultCoreConfigDefineType {
 }

package/lib/core/index.js

@@ -2,8 +2,9 @@ import "../chunk-5LRGHP36.js";
 import {
   CoreCfg,
   DeviceCfg
-} from "../chunk-SXPDBSIW.js";
-import "../chunk-UIPRZFST.js";
+} from "../chunk-HI6OZTI2.js";
+import "../chunk-BLE3V6QR.js";
+import "../chunk-ER4WMJJ6.js";
 import "../chunk-RX4VMVAI.js";
 import "../chunk-SHLPPEAY.js";
 import "../chunk-MLKGABMK.js";

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

@@ -1,24 +1,44 @@
-declare class Config<C extends Record<string, any>> {
+type ToString<T> = T extends string | number ? `${T}` : never;
+type PathImpl<T, Key extends keyof T> = Key extends string | number ? T[Key] extends Record<string, any> ? T[Key] extends ArrayLike<any> ? ToString<Key> | `${ToString<Key>}.${PathImpl<T[Key], Exclude<keyof T[Key], keyof any[]>>}` : ToString<Key> | `${ToString<Key>}.${PathImpl<T[Key], keyof T[Key]>}` : ToString<Key> : never;
+type Path<T> = PathImpl<T, keyof T> | keyof T;
+type PathValue<T, P> = P extends keyof T ? T[P] : P extends `${infer K}.${infer Rest}` ? K extends keyof T ? PathValue<T[K], Rest> : {
+    [Key in keyof T]: ToString<Key> extends K ? PathValue<T[Key], Rest> : never;
+}[keyof T] : never;
+declare class Config<C extends {
+    [key: string]: any;
+}> {
     #private;
     /**
      * @param name 插件名称:配置名称
      */
-    constructor(name: `${string}:${string}`, ConfigDir: string, DefaultConfig: C, DefineConfig: Record<string, any>);
+    constructor(name: `${string}:${string}`, ConfigDir: string, DefaultConfig: C, DefineConfig: {
+        [key: string]: any;
+    });
     loadConfig(): C;
     mergeWithDefaults(userConfig: C, defaultConfig: C, DefineConfig: Record<string, any>): C;
     /**
      * @description 获取配置路径对应的默认配置
+     * @param path 配置路径,支持任意深度的嵌套路径,传入空字符串''可获取整个配置对象
      */
-    getDef<T>(path: string): T;
+    getDef(path: ''): C;
+    getDef<P extends Path<C>>(path: P): PathValue<C, P>;
     /**
      * @description 获取配置路径对应的配置
+     * @param path 配置路径,支持任意深度的嵌套路径,传入空字符串''可获取整个配置对象
+     * @param isArray 是否返回 EnhancedArray 类型
+     * @param def 默认值
      */
-    get<T>(path: string, isArray?: false, def?: T): T;
-    get<T>(path: string, isArray: true, def?: T[]): EnhancedArray<T>;
+    get(path: '', isArray?: false, def?: C): C;
+    get<P extends Path<C>>(path: P, isArray?: false, def?: PathValue<C, P>): PathValue<C, P>;
+    get<P extends Path<C>, T = PathValue<C, P>>(path: P, isArray: true, def?: T[]): EnhancedArray<T extends any[] ? T[number] : T, C>;
     /**
+     * @description 设置配置项的值
+     * @param path 配置路径,支持任意深度的嵌套路径
+     * @param value 要设置的值,类型会根据路径自动推断
      * @param save 是否立即保存
      */
-    set<T>(path: string, value: T, save: boolean): void;
+    set(path: '', value: C, save: boolean): void;
+    set<P extends Path<C>>(path: P, value: PathValue<C, P>, save: boolean): void;
     /**
      * @description 立即保存配置
      */
@@ -26,9 +46,11 @@ declare class Config<C extends Record<string, any>> {
     watch(fnc?: (self: Config<C>, oldData: C, newData: C) => Promise<void> | void): this;
 }
 
-declare class EnhancedArray<T> extends Array<T> {
+declare class EnhancedArray<T, C extends {
+    [key: string]: any;
+}> extends Array<T> {
     #private;
-    constructor(cfg: Config<any>, items: T[], path: string);
+    constructor(cfg: Config<C>, items: T[], path: string);
     /**
      * @param element - string | number
      * @returns

package/lib/exports/config/index.js

@@ -1,7 +1,7 @@
 import {
   Config,
   EnhancedArray
-} from "../../chunk-UIPRZFST.js";
+} from "../../chunk-BLE3V6QR.js";
 import "../../chunk-RX4VMVAI.js";
 import "../../chunk-MLKGABMK.js";
 export {

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

@@ -1,6 +1,8 @@
-import { D as DatabaseType, a as DatabaseClassInstance, b as Dialect, c as DatabaseClassStatic, M as ModelAttributes, d as DatabaseReturn, e as MysAccountInfoTableType, f as MysDeviceInfoTableType, B as BaseUserInfoTableType, g as BaseGameUIDInfoTableType } from '../../mysUserInfo-BsyEENbc.js';
-export { l as BindUidsItemType, h as DatabaseArray, i as MysAccountType, j as MysDeviceInfoDatabaseBaseType, k as MysDeviceInfoDatabaseIdFpType, U as UidPermission } from '../../mysUserInfo-BsyEENbc.js';
+import { D as DatabaseType, a as DatabaseClassInstance, b as Dialect, c as DatabaseClassStatic, M as ModelAttributes, d as DatabaseReturn, e as MysDeviceInfoTableType, B as BaseUserInfoTableType, f as BaseGameUIDInfoTableType } from '../../mysUserInfo-CPIjniyl.js';
+export { j as BindUidsItemType, g as DatabaseArray, h as MysDeviceInfoDatabaseBaseType, i as MysDeviceInfoDatabaseIdFpType, U as UidPermission } from '../../mysUserInfo-CPIjniyl.js';
 import { DataTypes, ModelAttributeColumnOptions, Model, ModelStatic } from 'sequelize';
+import { a as MysAccountInfoTableType } from '../../mysAccountInfo-B7u5Sl8f.js';
+export { M as MysAccountType } from '../../mysAccountInfo-B7u5Sl8f.js';
 
 type DatabaseFn = <T extends Record<string, any>, D extends DatabaseType>() => DatabaseClassInstance<T, D>;
 

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

@@ -1,6 +1,7 @@
-import { j as MysDeviceInfoDatabaseBaseType, k as MysDeviceInfoDatabaseIdFpType, i as MysAccountType, f as MysDeviceInfoTableType, B as BaseUserInfoTableType, e as MysAccountInfoTableType, d as DatabaseReturn, D as DatabaseType, h as DatabaseArray, U as UidPermission, g as BaseGameUIDInfoTableType } from '../../mysUserInfo-BsyEENbc.js';
+import { M as MysAccountType, a as MysAccountInfoTableType } from '../../mysAccountInfo-B7u5Sl8f.js';
 import { SendMessage } from 'node-karin';
 import { AxiosRequestConfig, AxiosResponse } from 'node-karin/axios';
+import { h as MysDeviceInfoDatabaseBaseType, i as MysDeviceInfoDatabaseIdFpType, e as MysDeviceInfoTableType, B as BaseUserInfoTableType, d as DatabaseReturn, D as DatabaseType, g as DatabaseArray, U as UidPermission, f as BaseGameUIDInfoTableType } from '../../mysUserInfo-CPIjniyl.js';
 import 'sequelize';
 
 declare const MysApp: Readonly<{

package/lib/exports/mys/index.js

@@ -15,11 +15,11 @@ import {
   getUserFullInfo,
   getUserGameRolesByCookie,
   queryQRcode
-} from "../../chunk-F42OUZOV.js";
-import "../../chunk-ER4WMJJ6.js";
+} from "../../chunk-32QZ2PSX.js";
 import "../../chunk-5LRGHP36.js";
-import "../../chunk-SXPDBSIW.js";
-import "../../chunk-UIPRZFST.js";
+import "../../chunk-HI6OZTI2.js";
+import "../../chunk-BLE3V6QR.js";
+import "../../chunk-ER4WMJJ6.js";
 import "../../chunk-RX4VMVAI.js";
 import "../../chunk-SHLPPEAY.js";
 import "../../chunk-MLKGABMK.js";

package/lib/mysAccountInfo-B7u5Sl8f.d.ts

@@ -0,0 +1,14 @@
+declare const enum MysAccountType {
+    cn = "mihoyo",
+    os = "hoyolab"
+}
+interface MysAccountInfoTableType {
+    ltuid: string;
+    type: MysAccountType;
+    cookie: string;
+    stoken: string;
+    /** 绑定的设备md5 */
+    deviceMd5: string;
+}
+
+export { MysAccountType as M, type MysAccountInfoTableType as a };

package/lib/{mysUserInfo-BsyEENbc.d.ts → mysUserInfo-CPIjniyl.d.ts}

@@ -122,19 +122,6 @@ declare class DatabaseArray<T> extends Array<T> {
     clear(): this;
 }
 
-declare const enum MysAccountType {
-    cn = "mihoyo",
-    os = "hoyolab"
-}
-interface MysAccountInfoTableType {
-    ltuid: string;
-    type: MysAccountType;
-    cookie: string;
-    stoken: string;
-    /** 绑定的设备md5 */
-    deviceMd5: string;
-}
-
 interface MysDeviceInfoDatabaseBaseType {
     name: string;
     board: string;
@@ -181,4 +168,4 @@ type BaseGameUIDInfoTableType<Game extends string> = {
     [P in `${Game}-uids`]: Partial<Record<string, BindUidsItemType>>;
 };
 
-export { type BaseUserInfoTableType as B, DatabaseType as D, type ModelAttributes as M, UidPermission as U, type DatabaseClassInstance as a, Dialect as b, type DatabaseClassStatic as c, type DatabaseReturn as d, type MysAccountInfoTableType as e, type MysDeviceInfoTableType as f, type BaseGameUIDInfoTableType as g, DatabaseArray as h, MysAccountType as i, type MysDeviceInfoDatabaseBaseType as j, type MysDeviceInfoDatabaseIdFpType as k, type BindUidsItemType as l };
+export { type BaseUserInfoTableType as B, DatabaseType as D, type ModelAttributes as M, UidPermission as U, type DatabaseClassInstance as a, Dialect as b, type DatabaseClassStatic as c, type DatabaseReturn as d, type MysDeviceInfoTableType as e, type BaseGameUIDInfoTableType as f, DatabaseArray as g, type MysDeviceInfoDatabaseBaseType as h, type MysDeviceInfoDatabaseIdFpType as i, type BindUidsItemType as j };

package/lib/web.config.js

@@ -1,8 +1,9 @@
 import {
   CoreCfg,
   DeviceCfg
-} from "./chunk-SXPDBSIW.js";
-import "./chunk-UIPRZFST.js";
+} from "./chunk-HI6OZTI2.js";
+import "./chunk-BLE3V6QR.js";
+import "./chunk-ER4WMJJ6.js";
 import "./chunk-RX4VMVAI.js";
 import {
   dir
@@ -42,13 +43,17 @@ var web_config_default = defineConfig({
     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",
+        components.accordion.createItem("accordion-proxy-item-key", {
+          title: "\u4EE3\u7406\u8BBE\u7F6E",
+          subtitle: "\u7528\u4E8E\u4E0B\u8F7D\u63D2\u4EF6\u8D44\u6E90\u6216api\u8BF7\u6C42",
           children: [
-            components.input.url("githubProxyUrl", {
+            components.input.url("proxy-github", {
               label: "GitHub \u4EE3\u7406\u5730\u5740",
-              defaultValue: CoreCfg.get("githubProxyUrl")
+              defaultValue: CoreCfg.get("proxy.github")
+            }),
+            components.input.url(`proxy-${"hoyolab" /* os */}`, {
+              label: "Hoyolab \u7C73\u6E38\u793E API \u4EE3\u7406",
+              defaultValue: CoreCfg.get(`proxy.${"hoyolab" /* os */}`)
             })
           ]
         })
@@ -111,7 +116,15 @@ var web_config_default = defineConfig({
     try {
       lodash.forEach(changeConfig, (childrenValue, accordionKey) => {
         switch (accordionKey) {
-          case "accordion-config-key" /* Config */:
+          case "accordion-config-key" /* Config */: {
+            childrenValue.forEach((children) => {
+              lodash.forEach(children, (value, childrenKey) => {
+                const { key, value: formatValue } = FormatValue(childrenKey, value);
+                CfgMap[accordionKey].set(key, formatValue, false);
+              });
+            });
+            break;
+          }
           case "accordion-device-key" /* Device */: {
             childrenValue.forEach((children) => {
               lodash.forEach(children, (value, childrenKey) => {

package/package.json

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

package/resources/styles/karin-plugin-mys-core.css

@@ -107,7 +107,7 @@
 }
 
 /*
-! tailwindcss v3.4.18 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.19 | MIT License | https://tailwindcss.com
 */
 
 /*