koishi-plugin-elysia-api-aggregator 0.2.4 → 0.2.6

package/lib/config.d.ts

@@ -23,6 +23,7 @@ export type AggregatorSourceConfig = AutoFetchAggregatorSource | ManualAggregato
 export interface Config {
     sources: AggregatorSourceConfig[];
     debugMode?: boolean;
+    verboseLog?: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare const name = "elysia-api-aggregator";

package/lib/index.cjs

@@ -262,32 +262,27 @@ var sourceBaseSchema = import_koishi.Schema.object({
     import_koishi.Schema.const("gemini").description("Gemini"),
     import_koishi.Schema.const("openai-compatible").description("OpenAI 兼容")
   ]).description("平台类型"),
-  enabled: import_koishi.Schema.boolean().default(true).description("启用")
+  enabled: import_koishi.Schema.boolean().default(true).description("启用"),
+  autoFetchModels: import_koishi.Schema.boolean().default(true).description("是否自动拉取模型")
 });
 var sourceSchema = import_koishi.Schema.intersect([
   sourceBaseSchema,
-  import_koishi.Schema.intersect([
+  import_koishi.Schema.union([
+    import_koishi.Schema.object({}),
     import_koishi.Schema.object({
-      autoFetchModels: import_koishi.Schema.boolean().default(true).description("是否自动拉取模型")
-    }),
-    import_koishi.Schema.union([
-      import_koishi.Schema.object({
-        autoFetchModels: import_koishi.Schema.const(true).required()
-      }),
-      import_koishi.Schema.object({
-        autoFetchModels: import_koishi.Schema.const(false).required(),
-        manualModels: import_koishi.Schema.array(manualSourceModelSchema).role("table").description("手动添加模型")
-      })
-    ])
+      autoFetchModels: import_koishi.Schema.const(false).required(),
+      manualModels: import_koishi.Schema.array(manualSourceModelSchema).default([]).role("table").description("手动添加模型")
+    })
   ])
 ]);
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
-    sources: import_koishi.Schema.array(sourceSchema).description("添加源")
+    sources: import_koishi.Schema.array(sourceSchema).role("list").default([]).description("添加源")
   }).description("模型源配置"),
   // Debug options
   import_koishi.Schema.object({
-    debugMode: import_koishi.Schema.boolean().default(false).description("启用调试日志")
+    debugMode: import_koishi.Schema.boolean().default(false).description("启用调试日志"),
+    verboseLog: import_koishi.Schema.boolean().default(false).description("启用详细日志（输出配置摘要、hash 与重载判断过程）")
   }).description("调试选项")
 ]);
 var name = "elysia-api-aggregator";
@@ -354,10 +349,33 @@ function apply(ctx, config) {
   let pendingReload = false;
   let lastModelsHash = "";
   let lastConfigHash = "";
+  const summarizeSources = /* @__PURE__ */ __name((sources) => {
+    return sources.map((source) => ({
+      name: source.name,
+      baseUrl: source.baseUrl,
+      platform: source.platform,
+      enabled: source.enabled,
+      autoFetchModels: source.autoFetchModels,
+      manualModelsCount: source.autoFetchModels ? 0 : source.manualModels.length,
+      hasApiKey: Boolean(source.apiKey)
+    }));
+  }, "summarizeSources");
+  const verboseLog = /* @__PURE__ */ __name((message, payload) => {
+    if (!config.verboseLog) return;
+    if (payload === void 0) {
+      ctx.logger.info(`[aggregator verbose] ${message}`);
+      return;
+    }
+    ctx.logger.info(`[aggregator verbose] ${message}: ${JSON.stringify(payload)}`);
+  }, "verboseLog");
   const buildConfigHash = /* @__PURE__ */ __name(() => {
-    return JSON.stringify({
-      sources: config.sources
-    });
+    const normalized = {
+      sources: summarizeSources(config.sources)
+    };
+    const hash = JSON.stringify(normalized);
+    verboseLog("buildConfigHash summary", normalized);
+    verboseLog("buildConfigHash value", hash);
+    return hash;
   }, "buildConfigHash");
   const buildModelsHash = /* @__PURE__ */ __name((models) => {
     const normalized = [...models].map((m) => ({
@@ -398,22 +416,53 @@ function apply(ctx, config) {
     }));
   }, "mapManualSourceModels");
   async function loadModels(trigger = "config") {
+    verboseLog("loadModels entered", {
+      trigger,
+      isLoading,
+      pendingReload,
+      sourceCount: config.sources.length,
+      sources: summarizeSources(config.sources)
+    });
     if (isLoading) {
       pendingReload = true;
       if (config.debugMode) {
         ctx.logger.info(`loadModels skipped (already running), queued pending reload (trigger=${trigger})`);
       }
+      verboseLog("loadModels skipped because already loading", {
+        trigger,
+        pendingReload
+      });
       return;
     }
     isLoading = true;
     const loadStartedAt = Date.now();
     try {
       ctx.logger.info("Loading models...");
+      verboseLog("loadModels start state", {
+        trigger,
+        sourceCount: config.sources.length,
+        sources: summarizeSources(config.sources)
+      });
       const allModels = [];
       for (const source of config.sources) {
-        if (!source.enabled) continue;
+        if (!source.enabled) {
+          verboseLog("skip disabled source", {
+            name: source.name,
+            autoFetchModels: source.autoFetchModels
+          });
+          continue;
+        }
         const sourceStartedAt = Date.now();
         let sourceModels = [];
+        verboseLog("processing source", {
+          name: source.name,
+          baseUrl: source.baseUrl,
+          platform: source.platform,
+          enabled: source.enabled,
+          autoFetchModels: source.autoFetchModels,
+          manualModelsCount: source.autoFetchModels ? 0 : source.manualModels.length,
+          hasApiKey: Boolean(source.apiKey)
+        });
         if (source.autoFetchModels) {
           sourceModels = await fetcher.fetchModels(source);
         } else {
@@ -424,39 +473,90 @@ function apply(ctx, config) {
         ctx.logger.info(
           `[source] ${source.name}: ${sourceModels.length} models (${sourceCostMs}ms${source.autoFetchModels ? ", auto" : ", manual"})`
         );
+        verboseLog("source processed", {
+          name: source.name,
+          trigger,
+          sourceModelsCount: sourceModels.length,
+          sourceCostMs
+        });
       }
       service.updateModels(allModels);
       const totalCostMs = Date.now() - loadStartedAt;
       const modelsHash = buildModelsHash(allModels);
+      verboseLog("buildModelsHash value", {
+        modelsHash,
+        lastModelsHash,
+        allModelsCount: allModels.length
+      });
       if (modelsHash === lastModelsHash) {
         ctx.logger.info(`Total models loaded: ${allModels.length} (${totalCostMs}ms, unchanged)`);
+        verboseLog("models unchanged, skip emit", {
+          trigger,
+          allModelsCount: allModels.length,
+          totalCostMs
+        });
         return;
       }
       lastModelsHash = modelsHash;
       ctx.logger.info(`Total models loaded: ${allModels.length} (${totalCostMs}ms)`);
+      verboseLog("models updated", {
+        trigger,
+        allModelsCount: allModels.length,
+        totalCostMs,
+        lastModelsHash
+      });
       ctx.emit("elysia-api/models-updated", [...allModels]);
     } finally {
       isLoading = false;
+      verboseLog("loadModels finally", {
+        trigger,
+        pendingReload,
+        isLoading
+      });
       if (pendingReload) {
         pendingReload = false;
+        verboseLog("pending reload consumed", {
+          nextTrigger: "pending"
+        });
         void loadModels("pending");
       }
     }
   }
   __name(loadModels, "loadModels");
   lastConfigHash = buildConfigHash();
+  verboseLog("initial lastConfigHash", lastConfigHash);
   ctx.on("ready", () => {
+    verboseLog("ready event fired", {
+      sourceCount: config.sources.length,
+      sources: summarizeSources(config.sources)
+    });
     void loadModels("ready");
   });
   ctx.on("config", () => {
+    verboseLog("config event fired", {
+      sourceCount: config.sources.length,
+      sources: summarizeSources(config.sources),
+      lastConfigHash
+    });
     const configHash = buildConfigHash();
+    verboseLog("config event hash compare", {
+      configHash,
+      lastConfigHash,
+      equal: configHash === lastConfigHash
+    });
     if (configHash === lastConfigHash) {
       if (config.debugMode) {
         ctx.logger.info("aggregator: config event ignored (aggregator config unchanged)");
       }
+      verboseLog("config event ignored", {
+        reason: "unchanged"
+      });
       return;
     }
     lastConfigHash = configHash;
+    verboseLog("config event accepted", {
+      newLastConfigHash: lastConfigHash
+    });
     void loadModels("config");
   });
   ctx.command("elysia-api.models.reload", "重新加载模型列表").action(async () => {

package/lib/index.mjs

@@ -236,32 +236,27 @@ var sourceBaseSchema = Schema.object({
     Schema.const("gemini").description("Gemini"),
     Schema.const("openai-compatible").description("OpenAI 兼容")
   ]).description("平台类型"),
-  enabled: Schema.boolean().default(true).description("启用")
+  enabled: Schema.boolean().default(true).description("启用"),
+  autoFetchModels: Schema.boolean().default(true).description("是否自动拉取模型")
 });
 var sourceSchema = Schema.intersect([
   sourceBaseSchema,
-  Schema.intersect([
+  Schema.union([
+    Schema.object({}),
     Schema.object({
-      autoFetchModels: Schema.boolean().default(true).description("是否自动拉取模型")
-    }),
-    Schema.union([
-      Schema.object({
-        autoFetchModels: Schema.const(true).required()
-      }),
-      Schema.object({
-        autoFetchModels: Schema.const(false).required(),
-        manualModels: Schema.array(manualSourceModelSchema).role("table").description("手动添加模型")
-      })
-    ])
+      autoFetchModels: Schema.const(false).required(),
+      manualModels: Schema.array(manualSourceModelSchema).default([]).role("table").description("手动添加模型")
+    })
   ])
 ]);
 var Config = Schema.intersect([
   Schema.object({
-    sources: Schema.array(sourceSchema).description("添加源")
+    sources: Schema.array(sourceSchema).role("list").default([]).description("添加源")
   }).description("模型源配置"),
   // Debug options
   Schema.object({
-    debugMode: Schema.boolean().default(false).description("启用调试日志")
+    debugMode: Schema.boolean().default(false).description("启用调试日志"),
+    verboseLog: Schema.boolean().default(false).description("启用详细日志（输出配置摘要、hash 与重载判断过程）")
   }).description("调试选项")
 ]);
 var name = "elysia-api-aggregator";
@@ -328,10 +323,33 @@ function apply(ctx, config) {
   let pendingReload = false;
   let lastModelsHash = "";
   let lastConfigHash = "";
+  const summarizeSources = /* @__PURE__ */ __name((sources) => {
+    return sources.map((source) => ({
+      name: source.name,
+      baseUrl: source.baseUrl,
+      platform: source.platform,
+      enabled: source.enabled,
+      autoFetchModels: source.autoFetchModels,
+      manualModelsCount: source.autoFetchModels ? 0 : source.manualModels.length,
+      hasApiKey: Boolean(source.apiKey)
+    }));
+  }, "summarizeSources");
+  const verboseLog = /* @__PURE__ */ __name((message, payload) => {
+    if (!config.verboseLog) return;
+    if (payload === void 0) {
+      ctx.logger.info(`[aggregator verbose] ${message}`);
+      return;
+    }
+    ctx.logger.info(`[aggregator verbose] ${message}: ${JSON.stringify(payload)}`);
+  }, "verboseLog");
   const buildConfigHash = /* @__PURE__ */ __name(() => {
-    return JSON.stringify({
-      sources: config.sources
-    });
+    const normalized = {
+      sources: summarizeSources(config.sources)
+    };
+    const hash = JSON.stringify(normalized);
+    verboseLog("buildConfigHash summary", normalized);
+    verboseLog("buildConfigHash value", hash);
+    return hash;
   }, "buildConfigHash");
   const buildModelsHash = /* @__PURE__ */ __name((models) => {
     const normalized = [...models].map((m) => ({
@@ -372,22 +390,53 @@ function apply(ctx, config) {
     }));
   }, "mapManualSourceModels");
   async function loadModels(trigger = "config") {
+    verboseLog("loadModels entered", {
+      trigger,
+      isLoading,
+      pendingReload,
+      sourceCount: config.sources.length,
+      sources: summarizeSources(config.sources)
+    });
     if (isLoading) {
       pendingReload = true;
       if (config.debugMode) {
         ctx.logger.info(`loadModels skipped (already running), queued pending reload (trigger=${trigger})`);
       }
+      verboseLog("loadModels skipped because already loading", {
+        trigger,
+        pendingReload
+      });
       return;
     }
     isLoading = true;
     const loadStartedAt = Date.now();
     try {
       ctx.logger.info("Loading models...");
+      verboseLog("loadModels start state", {
+        trigger,
+        sourceCount: config.sources.length,
+        sources: summarizeSources(config.sources)
+      });
       const allModels = [];
       for (const source of config.sources) {
-        if (!source.enabled) continue;
+        if (!source.enabled) {
+          verboseLog("skip disabled source", {
+            name: source.name,
+            autoFetchModels: source.autoFetchModels
+          });
+          continue;
+        }
         const sourceStartedAt = Date.now();
         let sourceModels = [];
+        verboseLog("processing source", {
+          name: source.name,
+          baseUrl: source.baseUrl,
+          platform: source.platform,
+          enabled: source.enabled,
+          autoFetchModels: source.autoFetchModels,
+          manualModelsCount: source.autoFetchModels ? 0 : source.manualModels.length,
+          hasApiKey: Boolean(source.apiKey)
+        });
         if (source.autoFetchModels) {
           sourceModels = await fetcher.fetchModels(source);
         } else {
@@ -398,39 +447,90 @@ function apply(ctx, config) {
         ctx.logger.info(
           `[source] ${source.name}: ${sourceModels.length} models (${sourceCostMs}ms${source.autoFetchModels ? ", auto" : ", manual"})`
         );
+        verboseLog("source processed", {
+          name: source.name,
+          trigger,
+          sourceModelsCount: sourceModels.length,
+          sourceCostMs
+        });
       }
       service.updateModels(allModels);
       const totalCostMs = Date.now() - loadStartedAt;
       const modelsHash = buildModelsHash(allModels);
+      verboseLog("buildModelsHash value", {
+        modelsHash,
+        lastModelsHash,
+        allModelsCount: allModels.length
+      });
       if (modelsHash === lastModelsHash) {
         ctx.logger.info(`Total models loaded: ${allModels.length} (${totalCostMs}ms, unchanged)`);
+        verboseLog("models unchanged, skip emit", {
+          trigger,
+          allModelsCount: allModels.length,
+          totalCostMs
+        });
         return;
       }
       lastModelsHash = modelsHash;
       ctx.logger.info(`Total models loaded: ${allModels.length} (${totalCostMs}ms)`);
+      verboseLog("models updated", {
+        trigger,
+        allModelsCount: allModels.length,
+        totalCostMs,
+        lastModelsHash
+      });
       ctx.emit("elysia-api/models-updated", [...allModels]);
     } finally {
       isLoading = false;
+      verboseLog("loadModels finally", {
+        trigger,
+        pendingReload,
+        isLoading
+      });
       if (pendingReload) {
         pendingReload = false;
+        verboseLog("pending reload consumed", {
+          nextTrigger: "pending"
+        });
         void loadModels("pending");
       }
     }
   }
   __name(loadModels, "loadModels");
   lastConfigHash = buildConfigHash();
+  verboseLog("initial lastConfigHash", lastConfigHash);
   ctx.on("ready", () => {
+    verboseLog("ready event fired", {
+      sourceCount: config.sources.length,
+      sources: summarizeSources(config.sources)
+    });
     void loadModels("ready");
   });
   ctx.on("config", () => {
+    verboseLog("config event fired", {
+      sourceCount: config.sources.length,
+      sources: summarizeSources(config.sources),
+      lastConfigHash
+    });
     const configHash = buildConfigHash();
+    verboseLog("config event hash compare", {
+      configHash,
+      lastConfigHash,
+      equal: configHash === lastConfigHash
+    });
     if (configHash === lastConfigHash) {
       if (config.debugMode) {
         ctx.logger.info("aggregator: config event ignored (aggregator config unchanged)");
       }
+      verboseLog("config event ignored", {
+        reason: "unchanged"
+      });
       return;
     }
     lastConfigHash = configHash;
+    verboseLog("config event accepted", {
+      newLastConfigHash: lastConfigHash
+    });
     void loadModels("config");
   });
   ctx.command("elysia-api.models.reload", "重新加载模型列表").action(async () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-elysia-api-aggregator",
   "description": "Inspired by New-API, the Elysia-API model aggregator plugin allows automatic fetching and manual configuration of available AI models, designed to work with the orchestrator plugin.",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",