koishi-plugin-noah 2.1.3 → 2.2.0

package/lib/global/config.d.ts

@@ -0,0 +1,16 @@
+import { Schema } from 'koishi';
+import { GlobalConfig } from '../types/config';
+export declare const globalConfig: Schema<Schemastery.ObjectS<{
+    official_support_url: Schema<string, string>;
+    maoServerUrl: Schema<string, string>;
+    maoApiKey: Schema<string, string>;
+}>, Schemastery.ObjectT<{
+    official_support_url: Schema<string, string>;
+    maoServerUrl: Schema<string, string>;
+    maoApiKey: Schema<string, string>;
+}>>;
+declare module 'koishi' {
+    interface Context {
+        globalConfig: GlobalConfig;
+    }
+}

package/lib/index.cjs

@@ -32,7 +32,7 @@ var index_exports = {};
 __export(index_exports, {
   Config: () => Config,
   apply: () => apply14,
-  inject: () => inject3,
+  inject: () => inject4,
   name: () => name14
 });
 module.exports = __toCommonJS(index_exports);
@@ -1001,7 +1001,7 @@ async function ensureOfficialServerForUser(ctx, serverService, userService, uid,
   const userServers = await serverService.getServersByUid(uid);
   const existingOfficial = userServers.find((server3) => server3.type === "official");
   if (existingOfficial) return existingOfficial.id;
-  const baseUrl = officialSupportUrl || ctx.config.official_support_url;
+  const baseUrl = officialSupportUrl || ctx.globalConfig.official_support_url;
   const server2 = await serverService.createServerForUser(
     {
       type: "official",
@@ -1059,7 +1059,7 @@ function bind(ctx, config) {
         serverService,
         userService,
         session.user.id,
-        config.official_support_url
+        ctx.globalConfig.official_support_url
       );
     }
     const res = await cardService.createCard(
@@ -1301,7 +1301,7 @@ async function showCardMenu(ctx, session, card2, cardService, serverService, use
         serverService,
         userService,
         uid,
-        ctx.config.official_support_url
+        ctx.globalConfig.official_support_url
       );
     }
     await cardService.updateCard(card2.id, { code: cardCode, defaultServerId });
@@ -1936,10 +1936,10 @@ async function addServer(ctx, session, serverService, userService, from, uid, us
   let url;
   let serverName;
   if (serverType === "mao") {
-    url = ctx.config.maoServerUrl;
+    url = ctx.globalConfig.maoServerUrl;
     serverName = "MaoMaNi";
   } else if (serverType === "official") {
-    url = ctx.config.official_support_url;
+    url = ctx.globalConfig.official_support_url;
     serverName = "Official";
   } else {
     let attempts = 0;
@@ -2262,7 +2262,7 @@ var zh_CN_default2 = { _config: { $desc: "Core 模块设置", adminUsers: "**插
 
 // src/core/index.ts
 var name5 = "Noah-Core";
-var inject = ["database"];
+var inject = ["database", "globalConfig"];
 var logger2 = new import_koishi6.Logger("Noah-Core");
 function apply5(ctx, config) {
   ;
@@ -4133,7 +4133,7 @@ __name(apply8, "apply");
 var sdvx_exports = {};
 __export(sdvx_exports, {
   apply: () => apply13,
-  inject: () => inject2,
+  inject: () => inject3,
   logger: () => logger4,
   name: () => name13
 });
@@ -4941,6 +4941,7 @@ var servers_exports = {};
 __export(servers_exports, {
   ServerManager: () => ServerManager,
   apply: () => apply9,
+  inject: () => inject2,
   name: () => name9
 });
 
@@ -5192,7 +5193,7 @@ var SDVXService2 = class _SDVXService {
    */
   async getUserName(ctx, url, cardId) {
     const response = await ctx.http.get(`/my?card=${cardId}`, {
-      baseURL: url,
+      baseURL: ctx.globalConfig.maoServerUrl,
       responseType: "text"
     });
     const match = response.match(/猫网玩家\[([^\]]+)\]/);
@@ -5210,7 +5211,7 @@ var SDVXService2 = class _SDVXService {
    * @returns 验证是否通过
    */
   async verifyPin(ctx, url, cardId, pin) {
-    const apiKey = ctx.config.maoApiKey;
+    const apiKey = ctx.globalConfig.maoApiKey;
     if (!apiKey) {
       this.logger.warn("maoApiKey not configured");
       return false;
@@ -5218,7 +5219,7 @@ var SDVXService2 = class _SDVXService {
     const resp = await ctx.http.get(
       `/bot/v2/player/card?card=${cardId}`,
       {
-        baseURL: url,
+        baseURL: ctx.globalConfig.maoServerUrl,
         headers: { "X-API-Key": apiKey }
       }
     );
@@ -5238,13 +5239,13 @@ var SDVXService2 = class _SDVXService {
   }
   async getAllScore(ctx, url, cardId, config) {
     try {
-      const apiKey = ctx.config.maoApiKey;
+      const apiKey = ctx.globalConfig.maoApiKey;
       if (!apiKey) {
         this.logger.warn("maoApiKey not configured");
         return [];
       }
       const resp = await ctx.http.get(`/bot/v2/sdvx/scores?card=${cardId}`, {
-        baseURL: url,
+        baseURL: ctx.globalConfig.maoServerUrl,
         headers: { "X-API-Key": apiKey }
       });
       if (resp?.code !== 0 || !resp?.data) {
@@ -5302,13 +5303,13 @@ var SDVXService2 = class _SDVXService {
     }
   }
   async getScore(ctx, url, cardId, musicId, config) {
-    const apiKey = ctx.config.maoApiKey;
+    const apiKey = ctx.globalConfig.maoApiKey;
     if (!apiKey) {
       this.logger.warn("maoApiKey not configured");
       throw new Error("maoApiKey not configured");
     }
     const resp = await ctx.http.get(`/bot/v2/sdvx/find?card=${cardId}&mid=${musicId}`, {
-      baseURL: url,
+      baseURL: ctx.globalConfig.maoServerUrl,
       headers: { "X-API-Key": apiKey }
     });
     if (resp?.code !== 0 || !resp?.data) {
@@ -5382,13 +5383,13 @@ var SDVXService2 = class _SDVXService {
     return scoreObj;
   }
   async getRecentScores(ctx, url, cardId, config, count = 1) {
-    const apiKey = ctx.config.maoApiKey;
+    const apiKey = ctx.globalConfig.maoApiKey;
     if (!apiKey) {
       this.logger.warn("maoApiKey not configured");
       return [];
     }
     const resp = await ctx.http.get(`/bot/v2/sdvx/recent?card=${cardId}&count=${count}`, {
-      baseURL: url,
+      baseURL: ctx.globalConfig.maoServerUrl,
       headers: { "X-API-Key": apiKey }
     });
     if (resp?.code !== 0 || !resp?.data || resp.data.length === 0) {
@@ -5635,6 +5636,7 @@ var ServerFactory = class {
 
 // src/servers/index.ts
 var name9 = "Noah-Server";
+var inject2 = ["globalConfig"];
 var ServerManager = class _ServerManager {
   static {
     __name(this, "ServerManager");
@@ -6458,7 +6460,7 @@ var zh_CN_default4 = { _config: { $desc: "SDVX 模块设置", default_model: "<p
 
 // src/games/sdvx/index.ts
 var name13 = "Noah-SDVX";
-var inject2 = ["database"];
+var inject3 = ["database", "globalConfig"];
 var logger4 = new import_koishi18.Logger("Noah-SDVX");
 async function apply13(ctx, config) {
   ;
@@ -6473,7 +6475,7 @@ async function apply13(ctx, config) {
 __name(apply13, "apply");
 
 // src/config.ts
-var import_koishi25 = require("koishi");
+var import_koishi26 = require("koishi");
 
 // src/asset/config.ts
 var import_koishi19 = require("koishi");
@@ -6493,9 +6495,7 @@ var assetConfig = import_koishi19.Schema.object({
 var import_koishi20 = require("koishi");
 var coreConfig = import_koishi20.Schema.object({
   adminUsers: import_koishi20.Schema.array(String).role("table"),
-  guildNameCards: import_koishi20.Schema.array(String).role("table").default(["Noah  |  /help 获取食用指南"]),
-  maoServerUrl: import_koishi20.Schema.string().default("http://maomani.cn:573"),
-  official_support_url: import_koishi20.Schema.string().default("https://noah.logthm.com")
+  guildNameCards: import_koishi20.Schema.array(String).role("table").default(["Noah  |  /help 获取食用指南"])
 }).i18n({
   "en-US": en_US_default2._config,
   "zh-CN": zh_CN_default2._config
@@ -6545,15 +6545,22 @@ var import_koishi23 = require("koishi");
 var sdvxConfig = import_koishi23.Schema.object({
   default_model: import_koishi23.Schema.string().default("2025100700"),
   sdvx_data_url: import_koishi23.Schema.string().required(),
-  sdvx_search_url: import_koishi23.Schema.string().required(),
-  official_support_url: import_koishi23.Schema.string().required()
+  sdvx_search_url: import_koishi23.Schema.string().required()
 }).i18n({
   "en-US": en_US_default4._config,
   "zh-CN": zh_CN_default4._config
 });
 
-// src/slash/config.ts
+// src/global/config.ts
 var import_koishi24 = require("koishi");
+var globalConfig = import_koishi24.Schema.object({
+  official_support_url: import_koishi24.Schema.string().default("https://noah.logthm.com"),
+  maoServerUrl: import_koishi24.Schema.string().default("http://maomani.cn:577"),
+  maoApiKey: import_koishi24.Schema.string().role("secret").default("")
+});
+
+// src/slash/config.ts
+var import_koishi25 = require("koishi");
 
 // src/slash/locales/en-US.yml
 var en_US_default6 = { _config: { $desc: "Slash Module Settings", test_guilds: "**Guilds To Sync**", auto_sync_on_start: "**Auto Sync on Connect**" } };
@@ -6562,16 +6569,17 @@ var en_US_default6 = { _config: { $desc: "Slash Module Settings", test_guilds: "
 var zh_CN_default6 = { _config: { $desc: "Slash 模块设置", test_guilds: "**默认同步 Guild 列表**", auto_sync_on_start: "**连接后自动同步**" } };
 
 // src/slash/config.ts
-var slashConfig = import_koishi24.Schema.object({
-  test_guilds: import_koishi24.Schema.array(String).default([]),
-  auto_sync_on_start: import_koishi24.Schema.boolean().default(true)
+var slashConfig = import_koishi25.Schema.object({
+  test_guilds: import_koishi25.Schema.array(String).default([]),
+  auto_sync_on_start: import_koishi25.Schema.boolean().default(true)
 }).i18n({
   "en-US": en_US_default6._config,
   "zh-CN": zh_CN_default6._config
 });
 
 // src/config.ts
-var Config = import_koishi25.Schema.object({
+var Config = import_koishi26.Schema.object({
+  global: globalConfig,
   core: coreConfig,
   sdvx: sdvxConfig,
   poke: pokeConfig,
@@ -6582,9 +6590,10 @@ var Config = import_koishi25.Schema.object({
 
 // src/index.ts
 var name14 = "noah";
-var inject3 = ["database", "skia"];
+var inject4 = ["database", "skia"];
 async function apply14(ctx, config) {
   initConstants(ctx);
+  ctx.set("globalConfig", config.global);
   ctx.plugin(core_exports, config);
   ctx.plugin(general_exports, config);
   ctx.plugin(sdvx_exports, config);

package/lib/servers/index.d.ts

@@ -2,6 +2,7 @@ import { Context } from 'koishi';
 import { TServer, TGame } from '../types';
 import type { AppConfig } from '../types/config';
 export declare const name = "Noah-Server";
+export declare const inject: string[];
 export declare class ServerManager {
     private static instance;
     private factory;

package/lib/types/config.d.ts

@@ -5,6 +5,18 @@ import { MessageReply } from '../fun/poke/types';
  */
 export interface BaseConfig {
 }
+/**
+ * 全局配置接口
+ * 包含所有模块共享的配置项
+ */
+export interface GlobalConfig extends BaseConfig {
+    /** Official Support URL */
+    official_support_url?: string;
+    /** 猫网服务器 URL */
+    maoServerUrl?: string;
+    /** 猫网服务器 API Key */
+    maoApiKey?: string;
+}
 /**
  * Slash 配置接口
  * 包含 Slash 相关的配置项
@@ -24,12 +36,6 @@ export interface CoreConfig extends BaseConfig {
     adminUsers?: string[];
     /** 群名片列表 */
     guildNameCards?: string[];
-    /** 猫网服务器 URL */
-    maoServerUrl?: string;
-    /** 猫网服务器 API Key */
-    maoApiKey?: string;
-    /** Official Support URL */
-    official_support_url?: string;
 }
 /**
  * SDVX 游戏配置接口
@@ -42,8 +48,6 @@ export interface SDVXConfig extends BaseConfig {
     sdvx_data_url: string;
     /** SDVX 搜索 URL */
     sdvx_search_url: string;
-    /** Official Support URL */
-    official_support_url: string;
 }
 /**
  * 戳一戳功能配置接口
@@ -80,6 +84,8 @@ export interface AssetConfig extends BaseConfig {
  * 包含所有模块的配置项
  */
 export interface AppConfig {
+    /** 全局配置 */
+    global: GlobalConfig;
     /** 核心配置 */
     core: CoreConfig;
     /** SDVX 游戏配置 */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koishi-plugin-noah",
-    "version": "2.1.3",
+    "version": "2.2.0",
     "contributors": [
         "Logthm <logthm@outlook.com>"
     ],