koishi-plugin-elysia-api-aggregator 0.2.0 → 0.2.2

package/lib/index.cjs

@@ -39,7 +39,6 @@ var ModelFetcher = class {
     __name(this, "ModelFetcher");
   }
   async fetchModels(source) {
-    this.ctx.logger.info(`Fetching models from ${source.name} (${source.platform})`);
     try {
       switch (source.platform) {
         case "openai":
@@ -279,74 +278,113 @@ function apply(ctx, config) {
       getByType: /* @__PURE__ */ __name((type) => service.getByType(type), "getByType")
     }
   };
-  async function loadModels() {
-    if (config.debugMode) {
-      ctx.logger.info("=== loadModels: Starting to load models ===");
-    } else {
-      ctx.logger.info("Loading models...");
-    }
-    const fetchedModels = [];
-    for (const source of config.autoFetchSources) {
-      if (!source.enabled) continue;
-      if (config.debugMode) {
-        ctx.logger.info(`loadModels: Fetching from ${source.name}`);
-      }
-      const sourceModels = await fetcher.fetchModels(source);
-      fetchedModels.push(...sourceModels);
+  let isLoading = false;
+  let pendingReload = false;
+  let lastModelsHash = "";
+  let lastConfigHash = "";
+  const buildConfigHash = /* @__PURE__ */ __name(() => {
+    return JSON.stringify({
+      autoFetchSources: config.autoFetchSources,
+      manualModels: config.manualModels
+    });
+  }, "buildConfigHash");
+  const buildModelsHash = /* @__PURE__ */ __name((models) => {
+    const normalized = [...models].map((m) => ({
+      id: m.id,
+      name: m.name,
+      source: m.source,
+      sourceName: m.sourceName,
+      baseUrl: m.baseUrl,
+      platform: m.platform,
+      type: m.type,
+      maxTokens: m.maxTokens,
+      visionCapable: m.visionCapable,
+      toolsCapable: m.toolsCapable,
+      structuredOutput: m.structuredOutput,
+      thinkingMode: m.thinkingMode,
+      available: m.available
+    })).sort((a, b) => a.id.localeCompare(b.id));
+    return JSON.stringify(normalized);
+  }, "buildModelsHash");
+  async function loadModels(trigger = "config") {
+    if (isLoading) {
+      pendingReload = true;
       if (config.debugMode) {
-        ctx.logger.info(`loadModels: Fetched ${sourceModels.length} models from ${source.name}`);
-      } else {
-        ctx.logger.info(`Fetched ${sourceModels.length} models from ${source.name}`);
+        ctx.logger.info(`loadModels skipped (already running), queued pending reload (trigger=${trigger})`);
       }
+      return;
     }
-    if (config.debugMode) {
-      ctx.logger.info(`loadModels: Processing ${config.manualModels.length} manual models`);
-    }
-    const manualModels = config.manualModels.map((m) => {
-      if (config.debugMode) {
-        ctx.logger.info(`loadModels: Adding manual model ${m.id}`);
+    isLoading = true;
+    const loadStartedAt = Date.now();
+    try {
+      ctx.logger.info("Loading models...");
+      const fetchedModels = [];
+      for (const source of config.autoFetchSources) {
+        if (!source.enabled) continue;
+        const sourceStartedAt = Date.now();
+        const sourceModels = await fetcher.fetchModels(source);
+        fetchedModels.push(...sourceModels);
+        const sourceCostMs = Date.now() - sourceStartedAt;
+        ctx.logger.info(`[source] ${source.name}: ${sourceModels.length} models (${sourceCostMs}ms)`);
+      }
+      const manualModels = config.manualModels.map((m) => {
+        return {
+          id: m.id,
+          name: m.name,
+          source: "manual",
+          sourceName: m.sourceName,
+          baseUrl: m.baseUrl,
+          apiKey: m.apiKey,
+          platform: m.platform,
+          // 使用默认值
+          type: "llm",
+          maxTokens: 128e3,
+          visionCapable: false,
+          toolsCapable: false,
+          structuredOutput: false,
+          thinkingMode: "both",
+          available: true,
+          lastChecked: /* @__PURE__ */ new Date()
+        };
+      });
+      const allModels = [...fetchedModels, ...manualModels];
+      service.updateModels(allModels);
+      const totalCostMs = Date.now() - loadStartedAt;
+      ctx.logger.info(`[source] manual: ${manualModels.length} models`);
+      const modelsHash = buildModelsHash(allModels);
+      if (modelsHash === lastModelsHash) {
+        ctx.logger.info(`Total models loaded: ${allModels.length} (${totalCostMs}ms, unchanged)`);
+        return;
+      }
+      lastModelsHash = modelsHash;
+      ctx.logger.info(`Total models loaded: ${allModels.length} (${totalCostMs}ms)`);
+      ctx.emit("elysia-api/models-updated", [...allModels]);
+    } finally {
+      isLoading = false;
+      if (pendingReload) {
+        pendingReload = false;
+        void loadModels("pending");
       }
-      return {
-        id: m.id,
-        name: m.name,
-        source: "manual",
-        sourceName: m.sourceName,
-        baseUrl: m.baseUrl,
-        apiKey: m.apiKey,
-        platform: m.platform,
-        // 使用默认值
-        type: "llm",
-        maxTokens: 128e3,
-        visionCapable: false,
-        toolsCapable: false,
-        structuredOutput: false,
-        thinkingMode: "both",
-        available: true,
-        lastChecked: /* @__PURE__ */ new Date()
-      };
-    });
-    const allModels = [...fetchedModels, ...manualModels];
-    service.updateModels(allModels);
-    if (config.debugMode) {
-      ctx.logger.info(`loadModels: Total models loaded: ${allModels.length}`);
-      ctx.logger.info(`loadModels: Model IDs: ${allModels.map((m) => m.id).join(", ")}`);
-      ctx.logger.info(`loadModels: ctx.elysiaApi exists: ${ctx.elysiaApi != null}`);
-      ctx.logger.info(`loadModels: ctx.elysiaApi.models exists: ${ctx.elysiaApi?.models != null}`);
-    } else {
-      ctx.logger.info(`Total models loaded: ${allModels.length}`);
-    }
-    if (config.debugMode) {
-      ctx.logger.info(`loadModels: Emitting elysia-api/models-updated event with ${allModels.length} models`);
     }
-    ctx.emit("elysia-api/models-updated", [...allModels]);
   }
   __name(loadModels, "loadModels");
-  ctx.on("ready", loadModels);
+  lastConfigHash = buildConfigHash();
+  ctx.on("ready", () => {
+    void loadModels("ready");
+  });
   ctx.on("config", () => {
-    loadModels();
+    const configHash = buildConfigHash();
+    if (configHash === lastConfigHash) {
+      if (config.debugMode) {
+        ctx.logger.info("aggregator: config event ignored (aggregator config unchanged)");
+      }
+      return;
+    }
+    lastConfigHash = configHash;
+    void loadModels("config");
   });
   ctx.command("elysia-api.models.reload", "重新加载模型列表").action(async () => {
-    await loadModels();
+    await loadModels("command");
     const count = service.getAll().length;
     return `已加载 ${count} 个模型`;
   });

package/lib/index.mjs

@@ -13,7 +13,6 @@ var ModelFetcher = class {
     __name(this, "ModelFetcher");
   }
   async fetchModels(source) {
-    this.ctx.logger.info(`Fetching models from ${source.name} (${source.platform})`);
     try {
       switch (source.platform) {
         case "openai":
@@ -253,74 +252,113 @@ function apply(ctx, config) {
       getByType: /* @__PURE__ */ __name((type) => service.getByType(type), "getByType")
     }
   };
-  async function loadModels() {
-    if (config.debugMode) {
-      ctx.logger.info("=== loadModels: Starting to load models ===");
-    } else {
-      ctx.logger.info("Loading models...");
-    }
-    const fetchedModels = [];
-    for (const source of config.autoFetchSources) {
-      if (!source.enabled) continue;
-      if (config.debugMode) {
-        ctx.logger.info(`loadModels: Fetching from ${source.name}`);
-      }
-      const sourceModels = await fetcher.fetchModels(source);
-      fetchedModels.push(...sourceModels);
+  let isLoading = false;
+  let pendingReload = false;
+  let lastModelsHash = "";
+  let lastConfigHash = "";
+  const buildConfigHash = /* @__PURE__ */ __name(() => {
+    return JSON.stringify({
+      autoFetchSources: config.autoFetchSources,
+      manualModels: config.manualModels
+    });
+  }, "buildConfigHash");
+  const buildModelsHash = /* @__PURE__ */ __name((models) => {
+    const normalized = [...models].map((m) => ({
+      id: m.id,
+      name: m.name,
+      source: m.source,
+      sourceName: m.sourceName,
+      baseUrl: m.baseUrl,
+      platform: m.platform,
+      type: m.type,
+      maxTokens: m.maxTokens,
+      visionCapable: m.visionCapable,
+      toolsCapable: m.toolsCapable,
+      structuredOutput: m.structuredOutput,
+      thinkingMode: m.thinkingMode,
+      available: m.available
+    })).sort((a, b) => a.id.localeCompare(b.id));
+    return JSON.stringify(normalized);
+  }, "buildModelsHash");
+  async function loadModels(trigger = "config") {
+    if (isLoading) {
+      pendingReload = true;
       if (config.debugMode) {
-        ctx.logger.info(`loadModels: Fetched ${sourceModels.length} models from ${source.name}`);
-      } else {
-        ctx.logger.info(`Fetched ${sourceModels.length} models from ${source.name}`);
+        ctx.logger.info(`loadModels skipped (already running), queued pending reload (trigger=${trigger})`);
       }
+      return;
     }
-    if (config.debugMode) {
-      ctx.logger.info(`loadModels: Processing ${config.manualModels.length} manual models`);
-    }
-    const manualModels = config.manualModels.map((m) => {
-      if (config.debugMode) {
-        ctx.logger.info(`loadModels: Adding manual model ${m.id}`);
+    isLoading = true;
+    const loadStartedAt = Date.now();
+    try {
+      ctx.logger.info("Loading models...");
+      const fetchedModels = [];
+      for (const source of config.autoFetchSources) {
+        if (!source.enabled) continue;
+        const sourceStartedAt = Date.now();
+        const sourceModels = await fetcher.fetchModels(source);
+        fetchedModels.push(...sourceModels);
+        const sourceCostMs = Date.now() - sourceStartedAt;
+        ctx.logger.info(`[source] ${source.name}: ${sourceModels.length} models (${sourceCostMs}ms)`);
+      }
+      const manualModels = config.manualModels.map((m) => {
+        return {
+          id: m.id,
+          name: m.name,
+          source: "manual",
+          sourceName: m.sourceName,
+          baseUrl: m.baseUrl,
+          apiKey: m.apiKey,
+          platform: m.platform,
+          // 使用默认值
+          type: "llm",
+          maxTokens: 128e3,
+          visionCapable: false,
+          toolsCapable: false,
+          structuredOutput: false,
+          thinkingMode: "both",
+          available: true,
+          lastChecked: /* @__PURE__ */ new Date()
+        };
+      });
+      const allModels = [...fetchedModels, ...manualModels];
+      service.updateModels(allModels);
+      const totalCostMs = Date.now() - loadStartedAt;
+      ctx.logger.info(`[source] manual: ${manualModels.length} models`);
+      const modelsHash = buildModelsHash(allModels);
+      if (modelsHash === lastModelsHash) {
+        ctx.logger.info(`Total models loaded: ${allModels.length} (${totalCostMs}ms, unchanged)`);
+        return;
+      }
+      lastModelsHash = modelsHash;
+      ctx.logger.info(`Total models loaded: ${allModels.length} (${totalCostMs}ms)`);
+      ctx.emit("elysia-api/models-updated", [...allModels]);
+    } finally {
+      isLoading = false;
+      if (pendingReload) {
+        pendingReload = false;
+        void loadModels("pending");
       }
-      return {
-        id: m.id,
-        name: m.name,
-        source: "manual",
-        sourceName: m.sourceName,
-        baseUrl: m.baseUrl,
-        apiKey: m.apiKey,
-        platform: m.platform,
-        // 使用默认值
-        type: "llm",
-        maxTokens: 128e3,
-        visionCapable: false,
-        toolsCapable: false,
-        structuredOutput: false,
-        thinkingMode: "both",
-        available: true,
-        lastChecked: /* @__PURE__ */ new Date()
-      };
-    });
-    const allModels = [...fetchedModels, ...manualModels];
-    service.updateModels(allModels);
-    if (config.debugMode) {
-      ctx.logger.info(`loadModels: Total models loaded: ${allModels.length}`);
-      ctx.logger.info(`loadModels: Model IDs: ${allModels.map((m) => m.id).join(", ")}`);
-      ctx.logger.info(`loadModels: ctx.elysiaApi exists: ${ctx.elysiaApi != null}`);
-      ctx.logger.info(`loadModels: ctx.elysiaApi.models exists: ${ctx.elysiaApi?.models != null}`);
-    } else {
-      ctx.logger.info(`Total models loaded: ${allModels.length}`);
-    }
-    if (config.debugMode) {
-      ctx.logger.info(`loadModels: Emitting elysia-api/models-updated event with ${allModels.length} models`);
     }
-    ctx.emit("elysia-api/models-updated", [...allModels]);
   }
   __name(loadModels, "loadModels");
-  ctx.on("ready", loadModels);
+  lastConfigHash = buildConfigHash();
+  ctx.on("ready", () => {
+    void loadModels("ready");
+  });
   ctx.on("config", () => {
-    loadModels();
+    const configHash = buildConfigHash();
+    if (configHash === lastConfigHash) {
+      if (config.debugMode) {
+        ctx.logger.info("aggregator: config event ignored (aggregator config unchanged)");
+      }
+      return;
+    }
+    lastConfigHash = configHash;
+    void loadModels("config");
   });
   ctx.command("elysia-api.models.reload", "重新加载模型列表").action(async () => {
-    await loadModels();
+    await loadModels("command");
     const count = service.getAll().length;
     return `已加载 ${count} 个模型`;
   });

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.0",
+  "version": "0.2.2",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",