koishi-plugin-hhs-huatu 1.2.2 → 1.2.4

package/lib/config.d.ts

@@ -175,7 +175,7 @@ interface ParamConfig {
 export interface Config extends PromptConfig, ParamConfig {
     type: 'token' | 'login' | 'naifu' | 'sd-webui' | 'stable-horde' | 'comfyui';
     token?: string | string[];
-    tokenStrategy?: 'round-robin' | 'random' | 'fallback' | 'parallel';
+    tokenStrategy?: 'round-robin' | 'first-available' | 'random' | 'fallback' | 'parallel';
     email?: string;
     password?: string;
     authLv?: Computed<number>;

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import { Context } from 'koishi';
 import { Config } from './config';
-export declare const usage = "\n# \uD83C\uDFA8 hhs-huatu \u63D2\u4EF6\n\n> **\u57FA\u4E8E [novelai-bot](https://bot.novelai.dev/) \u7684\u589E\u5F3A\u7248 AI \u7ED8\u56FE\u63D2\u4EF6\uFF0C\u63D0\u4F9B\u66F4\u667A\u80FD\u3001\u4FBF\u6377\u7684 NovelAI \u4F53\u9A8C\u3002**\n\n[![](https://img.shields.io/badge/QQ\u7FA4-112879548-blue)](https://qm.qq.com/q/4nKKvckKbu) [![](https://img.shields.io/badge/GitHub-\u4ED3\u5E93\u5730\u5740-black)](https://github.com/hhs2275/koishi-plugin-hhs-huatu)\n\n### \u2728 \u6838\u5FC3\u4EAE\u70B9\n\u65B0\u7248\u672C\u6539\u7528\u6570\u636E\u5E93\u3002\u4F60\u7684\u4F1A\u5458\u6570\u636E\u5728 \u4F60\u7684 Koishi \u6839\u76EE\u5F55/data/hhs-huatu-user-data.json\u3002\u628A\u5B83\u653E\u5728hhs-huatu-import\u6587\u4EF6\u5939\u4E0B\u9762\uFF0C\u7136\u540E\u53D1\u201C\u4F1A\u5458\u8C03\u8BD5--import\u201D\u6307\u4EE4\uFF0C\u5C31\u53EF\u4EE5\u628A\u6570\u636E\u5BFC\u5165\u6570\u636E\u5E93\u3002\n\n\u672C\u63D2\u4EF6\u9488\u5BF9 **NovelAI V4 / V4.5 / V5** \u6A21\u578B\u8FDB\u884C\u4E86\u6DF1\u5EA6\u9002\u914D\uFF0C\u9884\u8BBE\u5FEB\u6377\u6307\u4EE4\uFF0C\u52A9\u4F60\u5FEB\u901F\u5207\u6362\u6A21\u578B\uFF1A\n\n| \u6307\u4EE4 | \u5BF9\u5E94\u6A21\u578B (Model) | \u8BF4\u660E |\n| :--- | :--- | :--- |\n| `nai4` | `nai-diffusion-4-full` | V4 \u5168\u91CF\u6A21\u578B |\n| `nai4c` | `nai-diffusion-4-curated` | V4 \u7CBE\u9009\u6A21\u578B |\n| `nai4-5` | `nai-diffusion-4-5-full` | V4.5 \u5168\u91CF\u6A21\u578B |\n| `nai4-5c` | `nai-diffusion-4-5-curated` | V4.5 \u7CBE\u9009\u6A21\u578B |\n| `nai5` | `nai-diffusion-5-full` | V5 \u5168\u91CF\u6A21\u578B |\n| `nai5c` | `nai-diffusion-5-curated` | V5 \u7CBE\u9009\u6A21\u578B |\n\n### \uD83D\uDEE0\uFE0F \u529F\u80FD\u5217\u8868\n\n**\uD83C\uDFA8 \u7ED8\u56FE\u6838\u5FC3**\n* **\u5168\u9762\u652F\u6301**\uFF1A\u6587\u751F\u56FE\u3001\u56FE\u751F\u56FE\u57FA\u7840\u529F\u80FD\u5B8C\u6574\u3002\n* **\u5C40\u90E8\u91CD\u7ED8 (Inpaint)**\uFF1A\u652F\u6301\u5BF9\u56FE\u7247\u7279\u5B9A\u533A\u57DF\u8FDB\u884C\u91CD\u7ED8\u3002\n* **\u5BFC\u6F14\u5DE5\u5177**\uFF1Anovelai\u5B98\u7F51\u7684\u5BFC\u6F14\u5DE5\u5177\u529F\u80FD\u3002\n* **V4 \u89D2\u8272\u63D0\u793A\u8BCD**\uFF1Anovelai\u5B98\u7F51\u7684\u591A\u89D2\u8272\u63D0\u793A\u8BCD\u7CFB\u7EDF\u3002\n\n**\u2699\uFE0F \u7CFB\u7EDF\u4E0E\u7BA1\u7406**\n* **\u9AD8\u5E76\u53D1\u4F18\u5316**\uFF1A\u5185\u7F6E\u961F\u5217\u7CFB\u7EDF\u4E0E Token \u6C60\u8F6E\u8BE2\uFF0C\u591A\u8D26\u53F7\u8D1F\u8F7D\u5747\u8861\u3002\n* **\u4F1A\u5458\u7BA1\u7406**\uFF1A\u652F\u6301\u7528\u6237\u5206\u7EA7\u7BA1\u7406\uFF1B\u53EF\u914D\u7F6E\u4EC5\u4F1A\u5458\u4F7F\u7528\u4F1A\u6D88\u8017\u914D\u989D\u7684 nai5 / nai5c\u3002\n* **\u667A\u80FD\u5BA1\u6838**\uFF1A\u96C6\u6210\u817E\u8BAF AI \u6216 API4AI\uFF0C\u81EA\u52A8\u8FC7\u6EE4\u8FDD\u89C4\u5185\u5BB9\u3002\n\n### \uD83D\uDDD3\uFE0F \u5F00\u53D1\u8BA1\u5212\n- [\u221A] **\u70B9\u6570\u63A7\u5236\u7CFB\u7EDF**\uFF1A\u7CBE\u7EC6\u5316\u63A7\u5236\u7528\u6237\u70B9\u6570\u6D88\u8017\u8FDB\u884C\u672C\u5730\u8BA1\u7B97\uFF0C\u53EF\u80FD\u5B58\u5728\u8BEF\u5DEE\uFF0C\u8BF7\u4EE5\u5B9E\u9645\u6263\u8D39\u4E3A\u51C6\u3002\n- [x] ~~**\u6C1B\u56F4\u4F20\u8F93\u529F\u80FD**\uFF1A\u5B9E\u73B0novelai\u5B98\u7F51\u7684\u6C1B\u56F4\u4F20\u8F93\u529F\u80FD\u3002v4\u7248\u672C\u7684\u98CE\u5473\u4F20\u8F93api\u4E0D\u5141\u8BB8\u76F4\u63A5\u53D1\u56FE\uFF0C\u9700\u8981\u5148\u53BB\u5B98\u7F51\u751F\u6210\u5BF9\u5E94\u6587\u4EF6\uFF0C\u6211\u505A\u4E0D\u5230\u3002~~\n- [\u221A] **\u89D2\u8272\u53C2\u8003\u529F\u80FD**\uFF1A\u5B9E\u73B0novelai\u5B98\u7F51\u7684\u89D2\u8272\u53C2\u8003\u529F\u80FD\u3002\uFF08\u5DF2\u88AB\u7CBE\u786E\u53C2\u8003\u66FF\u4EE3\uFF09\n---\n\n### \uD83D\uDCD6 \u66F4\u591A\u8D44\u6E90\n* \u8BE6\u7EC6\u6559\u7A0B\u8BF7\u79FB\u6B65 [GitHub \u4ED3\u5E93](https://github.com/hhs2275/koishi-plugin-hhs-huatu)\n* \u9047\u5230\u95EE\u9898\uFF1F\u6B22\u8FCE\u52A0\u5165\u4EA4\u6D41\u7FA4\uFF1A[112879548](https://qm.qq.com/q/4nKKvckKbu) (\u8054\u7CFB\u7FA4\u4E3B\u53CD\u9988\u95EE\u9898/\u63D0\u4EA4\u5EFA\u8BAE/\u6109\u5FEB\u73A9\u800D)\n";
+export declare const usage = "\n# \uD83C\uDFA8 hhs-huatu \u63D2\u4EF6\n\n> **\u57FA\u4E8E [novelai-bot](https://bot.novelai.dev/) \u7684\u589E\u5F3A\u7248 AI \u7ED8\u56FE\u63D2\u4EF6\uFF0C\u63D0\u4F9B\u66F4\u667A\u80FD\u3001\u4FBF\u6377\u7684 NovelAI \u4F53\u9A8C\u3002**\n\n[![](https://img.shields.io/badge/QQ\u7FA4-112879548-blue)](https://qm.qq.com/q/4nKKvckKbu) [![](https://img.shields.io/badge/GitHub-\u4ED3\u5E93\u5730\u5740-black)](https://github.com/hhs2275/koishi-plugin-hhs-huatu)\n\n### \u2728 \u6838\u5FC3\u4EAE\u70B9\n\u65B0\u7248\u672C\u6539\u7528\u6570\u636E\u5E93\u3002\u4F60\u7684\u4F1A\u5458\u6570\u636E\u5728 \u4F60\u7684 Koishi \u6839\u76EE\u5F55/data/hhs-huatu-user-data.json\u3002\u628A\u5B83\u653E\u5728hhs-huatu-import\u6587\u4EF6\u5939\u4E0B\u9762\uFF0C\u7136\u540E\u53D1\u201C\u4F1A\u5458\u8C03\u8BD5--import\u201D\u6307\u4EE4\uFF0C\u5C31\u53EF\u4EE5\u628A\u6570\u636E\u5BFC\u5165\u6570\u636E\u5E93\u3002\n\n\u672C\u63D2\u4EF6\u9488\u5BF9 **NovelAI V4 / V4.5 / V5** \u6A21\u578B\u8FDB\u884C\u4E86\u6DF1\u5EA6\u9002\u914D\uFF0C\u9884\u8BBE\u5FEB\u6377\u6307\u4EE4\uFF0C\u52A9\u4F60\u5FEB\u901F\u5207\u6362\u6A21\u578B\uFF1A\n\n| \u6307\u4EE4 | \u5BF9\u5E94\u6A21\u578B (Model) | \u8BF4\u660E |\n| :--- | :--- | :--- |\n| `nai4` | `nai-diffusion-4-full` | V4 \u5168\u91CF\u6A21\u578B |\n| `nai4c` | `nai-diffusion-4-curated` | V4 \u7CBE\u9009\u6A21\u578B |\n| `nai4-5` | `nai-diffusion-4-5-full` | V4.5 \u5168\u91CF\u6A21\u578B |\n| `nai4-5c` | `nai-diffusion-4-5-curated` | V4.5 \u7CBE\u9009\u6A21\u578B |\n| `nai5` | `nai-diffusion-5-full` | V5 \u5168\u91CF\u6A21\u578B |\n| `nai5c` | `nai-diffusion-5-curated` | V5 \u7CBE\u9009\u6A21\u578B |\n\n### \uD83D\uDEE0\uFE0F \u529F\u80FD\u5217\u8868\n\n**\uD83C\uDFA8 \u7ED8\u56FE\u6838\u5FC3**\n* **\u5168\u9762\u652F\u6301**\uFF1A\u6587\u751F\u56FE\u3001\u56FE\u751F\u56FE\u57FA\u7840\u529F\u80FD\u5B8C\u6574\u3002\n* **\u5C40\u90E8\u91CD\u7ED8 (Inpaint)**\uFF1A\u652F\u6301\u5BF9\u56FE\u7247\u7279\u5B9A\u533A\u57DF\u8FDB\u884C\u91CD\u7ED8\u3002\n* **\u5BFC\u6F14\u5DE5\u5177**\uFF1Anovelai\u5B98\u7F51\u7684\u5BFC\u6F14\u5DE5\u5177\u529F\u80FD\u3002\n* **V4 \u89D2\u8272\u63D0\u793A\u8BCD**\uFF1Anovelai\u5B98\u7F51\u7684\u591A\u89D2\u8272\u63D0\u793A\u8BCD\u7CFB\u7EDF\u3002\n\n**\u2699\uFE0F \u7CFB\u7EDF\u4E0E\u7BA1\u7406**\n* **\u9AD8\u5E76\u53D1\u4F18\u5316**\uFF1A\u5185\u7F6E\u961F\u5217\u7CFB\u7EDF\u4E0E Token \u6C60\u8F6E\u8BE2\uFF0C\u591A\u8D26\u53F7\u8D1F\u8F7D\u5747\u8861\u3002\n* **\u4F1A\u5458\u7BA1\u7406**\uFF1A\u652F\u6301\u7528\u6237\u5206\u7EA7\u7BA1\u7406\uFF1B\u53EF\u914D\u7F6E\u4EC5\u4F1A\u5458\u4F7F\u7528\u4F1A\u6D88\u8017\u914D\u989D\u7684 nai5 / nai5c\u3002\n* **\u667A\u80FD\u5BA1\u6838**\uFF1A\u96C6\u6210\u817E\u8BAF AI \u6216 API4AI\uFF0C\u81EA\u52A8\u8FC7\u6EE4\u8FDD\u89C4\u5185\u5BB9\u3002\n\n### \uD83D\uDDD3\uFE0F \u5F00\u53D1\u8BA1\u5212\n- [\u221A] **\u70B9\u6570\u63A7\u5236\u7CFB\u7EDF**\uFF1A\u6309 NovelAI \u5B98\u7F51\u524D\u7AEF\u516C\u5F0F\u9884\u6263\u672C\u5730\u70B9\u6570\uFF08V5 \u4E3A V4.5 \u7684 1.5 \u500D\uFF09\u3002\u5B9E\u9645\u6263\u8D39\u4EE5 NovelAI \u8D26\u6237\u4E3A\u51C6\u3002\n- [x] ~~**\u6C1B\u56F4\u4F20\u8F93\u529F\u80FD**\uFF1A\u5B9E\u73B0novelai\u5B98\u7F51\u7684\u6C1B\u56F4\u4F20\u8F93\u529F\u80FD\u3002v4\u7248\u672C\u7684\u98CE\u5473\u4F20\u8F93api\u4E0D\u5141\u8BB8\u76F4\u63A5\u53D1\u56FE\uFF0C\u9700\u8981\u5148\u53BB\u5B98\u7F51\u751F\u6210\u5BF9\u5E94\u6587\u4EF6\uFF0C\u6211\u505A\u4E0D\u5230\u3002~~\n- [\u221A] **\u89D2\u8272\u53C2\u8003\u529F\u80FD**\uFF1A\u5B9E\u73B0novelai\u5B98\u7F51\u7684\u89D2\u8272\u53C2\u8003\u529F\u80FD\u3002\uFF08\u5DF2\u88AB\u7CBE\u786E\u53C2\u8003\u66FF\u4EE3\uFF09\n---\n\n### \uD83D\uDCD6 \u66F4\u591A\u8D44\u6E90\n* \u8BE6\u7EC6\u6559\u7A0B\u8BF7\u79FB\u6B65 [GitHub \u4ED3\u5E93](https://github.com/hhs2275/koishi-plugin-hhs-huatu)\n* \u9047\u5230\u95EE\u9898\uFF1F\u6B22\u8FCE\u52A0\u5165\u4EA4\u6D41\u7FA4\uFF1A[112879548](https://qm.qq.com/q/4nKKvckKbu) (\u8054\u7CFB\u7FA4\u4E3B\u53CD\u9988\u95EE\u9898/\u63D0\u4EA4\u5EFA\u8BAE/\u6109\u5FEB\u73A9\u800D)\n";
 export * from './config';
 export declare const reactive = true;
 export declare const name = "hhs-huatu";

package/lib/index.js

@@ -1083,9 +1083,18 @@ var Config = import_koishi2.Schema.intersect([
         import_koishi2.Schema.object({
           type: import_koishi2.Schema.const("token"),
           token: import_koishi2.Schema.union([
-            import_koishi2.Schema.string().description("授权令牌。"),
-            import_koishi2.Schema.array(import_koishi2.Schema.string()).description("多个授权令牌（使用令牌池，每个令牌同时仅处理一个任务）")
-          ]).role("secret").required()
+            import_koishi2.Schema.string().role("secret").description("单个授权令牌。"),
+            import_koishi2.Schema.array(
+              import_koishi2.Schema.string().role("secret").default("")
+            ).role("table").default([""]).description("多个授权令牌。每行填写一个令牌，可直接新增空白行，不需要手写 JSON 引号。")
+          ]).required(),
+          tokenStrategy: import_koishi2.Schema.union([
+            import_koishi2.Schema.const("round-robin").description("轮询（推荐：按顺序轮流使用；目标令牌忙时跳过，下一次从后续位置继续）"),
+            import_koishi2.Schema.const("first-available").description("首个可用（总是优先前面的空闲令牌，可能让第一个令牌消耗更多）"),
+            import_koishi2.Schema.const("random").description("随机（从空闲令牌中随机选择，长期大致均衡但不保证严格轮流）"),
+            import_koishi2.Schema.const("fallback").description("回退（兼容旧配置：按首个可用分配；请求失败不会自动换令牌重试）"),
+            import_koishi2.Schema.const("parallel").description("并行（兼容旧配置：按空闲令牌并发处理，并发上限受令牌数量限制）")
+          ]).description("多个授权令牌的使用策略（token 为数组时生效；单个令牌时无影响）").default("round-robin")
         }),
         import_koishi2.Schema.object({
           type: import_koishi2.Schema.const("login"),
@@ -1512,12 +1521,15 @@ var QueueSystem = class {
     this.generateImageFn = generateImageFn;
     this.membershipSystem = membershipSystem || null;
     if (Array.isArray(config.token) && config.token.length > 0) {
-      this.tokenPool = new Array(config.token.length).fill(false);
+      this.tokenIndices = config.token.map((token, index) => typeof token === "string" && token.trim() ? index : -1).filter((index) => index >= 0);
+      this.tokenPool = new Array(this.tokenIndices.length).fill(false);
       this.maxConcurrentTasks = this.tokenPool.length;
     } else if (typeof config.token === "string" && config.token) {
+      this.tokenIndices = [0];
       this.tokenPool = [false];
       this.maxConcurrentTasks = 1;
     } else {
+      this.tokenIndices = [0];
       this.tokenPool = [false];
       this.maxConcurrentTasks = 1;
     }
@@ -1537,7 +1549,6 @@ var QueueSystem = class {
   userLastTask = /* @__PURE__ */ Object.create(null);
   // 重画相关
   lastRedrawTime = 0;
-  usedTokenIndices = /* @__PURE__ */ new Set();
   redrawLock = false;
   redrawWaitQueue = [];
   // 最大并发任务数
@@ -1546,6 +1557,11 @@ var QueueSystem = class {
   membershipSystem = null;
   // Token管理相关
   tokenPool = [];
+  // tokenPool 使用紧凑槽位，tokenIndices 保留配置数组中的真实下标，
+  // 这样可以忽略配置中为了方便填写而保留的空白行。
+  tokenIndices = [];
+  // 轮询分配的起始索引。每次成功分配后指向下一个 token。
+  nextTokenIndex = 0;
   // 获取锁
   async acquireRedrawLock() {
     if (!this.redrawLock) {
@@ -1567,29 +1583,34 @@ var QueueSystem = class {
       this.redrawLock = false;
     }
   }
-  // 生成唯一且未被最近使用的 token 索引
-  getUniqueTokenIndex(currentIndex, tokenCount) {
-    if (tokenCount <= 1) return 0;
-    if (this.usedTokenIndices.size >= tokenCount) {
-      this.usedTokenIndices.clear();
-    }
-    let newIndex = currentIndex;
-    let attempts = 0;
-    const maxAttempts = tokenCount * 2;
-    while (this.usedTokenIndices.has(newIndex) && attempts < maxAttempts) {
-      newIndex = (newIndex + 1) % tokenCount;
-      attempts++;
-    }
-    this.usedTokenIndices.add(newIndex);
-    return newIndex;
-  }
-  // 从 Token 池中获取一个空闲的 token 索引（并标记为占用）
+  // 从 Token 池中获取一个空闲的 token 索引（并标记为占用）。
+  // 轮询时从 nextTokenIndex 开始查找，因此即使任务是串行执行，
+  // 也会在每次任务之间切换到下一个 token，而不是始终命中 token[0]。
   acquireTokenIndex() {
     if (!this.tokenPool.length) return null;
-    for (let i = 0; i < this.tokenPool.length; i++) {
-      if (!this.tokenPool[i]) {
-        this.tokenPool[i] = true;
-        return i;
+    const strategy = this.config.tokenStrategy || "round-robin";
+    if (strategy === "random") {
+      const available = this.tokenPool.map((busy, slot2) => busy ? -1 : slot2).filter((slot2) => slot2 >= 0);
+      if (!available.length) return null;
+      const slot = available[Math.floor(Math.random() * available.length)];
+      this.tokenPool[slot] = true;
+      return this.tokenIndices[slot];
+    }
+    if (strategy === "round-robin") {
+      for (let offset = 0; offset < this.tokenPool.length; offset++) {
+        const slot = (this.nextTokenIndex + offset) % this.tokenPool.length;
+        if (!this.tokenPool[slot]) {
+          this.tokenPool[slot] = true;
+          this.nextTokenIndex = (slot + 1) % this.tokenPool.length;
+          return this.tokenIndices[slot];
+        }
+      }
+      return null;
+    }
+    for (let slot = 0; slot < this.tokenPool.length; slot++) {
+      if (!this.tokenPool[slot]) {
+        this.tokenPool[slot] = true;
+        return this.tokenIndices[slot];
       }
     }
     return null;
@@ -1598,8 +1619,9 @@ var QueueSystem = class {
   releaseTokenIndex(index) {
     if (index == null) return;
     if (!this.tokenPool.length) return;
-    if (index >= 0 && index < this.tokenPool.length) {
-      this.tokenPool[index] = false;
+    const slot = this.tokenIndices.indexOf(index);
+    if (slot >= 0) {
+      this.tokenPool[slot] = false;
     }
   }
   // 提供给外部任务借用/归还 token 索引
@@ -1938,8 +1960,14 @@ var MembershipSystem = class {
   }
   // ========== 点数计算相关 ==========
   /**
-   * 计算预估消耗点数（基于 Opus 套餐）
-   * 社区逆向工程的 NAI Anlas 估算公式
+   * 按 NovelAI 官网前端公式计算 Anlas。
+   * 来源：novelai.net/_next/static/chunks/1052-*.js
+   * SDXL / V4 / V4.5 / V5：
+   *   M = ceil(2.951823174884865e-6 * pixels + 5.753298233447344e-7 * pixels * steps)
+   *   M *= sm_dyn ? 1.4 : smea ? 1.2 : 1
+   *   V5 再乘 1.5
+   *   cost = max(ceil(M * strength), 2)
+   * Opus 免费：无角色参考、像素 ≤ 1048576、步数 ≤ 28 时第一张为 0。
    */
   calculatePointsCost(params) {
     if (!this.config.pointsEnabled) return 0;
@@ -1952,18 +1980,19 @@ var MembershipSystem = class {
       strength = 1,
       isImg2Img = false,
       preciseRefCount = 0,
-      chargeOpusFreeRange = false
+      chargeOpusFreeRange = false,
+      model
     } = params;
-    const pixels = width * height;
-    if (!chargeOpusFreeRange && pixels <= 1048576 && steps <= 28) {
-      return preciseRefCount * 5;
-    }
-    let L = Math.ceil((2951823174884865e-30 * pixels + 5753298233447344e-22 * pixels * steps) * 1.21);
-    if (smeaDyn) L = Math.ceil(L * 1.4);
-    else if (smea) L = Math.ceil(L * 1.2);
-    if (isImg2Img) {
-      L = Math.max(Math.ceil(L * strength), 2);
-    }
+    let pixels = width * height;
+    if (pixels < 65536) pixels = 65536;
+    const opusFree = !chargeOpusFreeRange && preciseRefCount <= 0 && pixels <= 1048576 && steps <= 28;
+    if (opusFree) return 0;
+    let L = Math.ceil(2951823174884865e-21 * pixels + 5753298233447344e-22 * pixels * steps);
+    if (smeaDyn) L *= 1.4;
+    else if (smea) L *= 1.2;
+    if (this.isNai5Model(model)) L *= 1.5;
+    const resolvedStrength = isImg2Img ? strength : 1;
+    L = Math.max(Math.ceil(L * resolvedStrength), 2);
     L += preciseRefCount * 5;
     return L;
   }
@@ -3622,7 +3651,7 @@ var import_koishi9 = require("koishi");
 var import_koishi7 = require("koishi");
 
 // src/services/points.ts
-function getUnitPointsCost(runtime, session, options2, width, height, isImg2Img, preciseRefCount, chargeOpusFreeRange = false) {
+function getUnitPointsCost(runtime, session, options2, width, height, isImg2Img, preciseRefCount, chargeOpusFreeRange = false, model) {
   const steps = options2.steps ?? session.resolve(isImg2Img ? runtime.config.imageSteps : runtime.config.textSteps) ?? 23;
   const resolvedSmeaDyn = options2.smeaDyn ?? runtime.config.smeaDyn ?? false;
   const resolvedSmea = (options2.smea ?? runtime.config.smea) || resolvedSmeaDyn;
@@ -3635,7 +3664,8 @@ function getUnitPointsCost(runtime, session, options2, width, height, isImg2Img,
     strength: options2.strength,
     isImg2Img,
     preciseRefCount,
-    chargeOpusFreeRange
+    chargeOpusFreeRange,
+    model: model ?? options2.model
   });
 }
 __name(getUnitPointsCost, "getUnitPointsCost");
@@ -3643,7 +3673,7 @@ function calculateTaskPointsCost(runtime, session, options2, width, height, isIm
   const uid = userId || session.userId;
   const resolvedModel = model ?? options2.model;
   const count = Math.max(1, drawCount);
-  const unitFree = getUnitPointsCost(runtime, session, options2, width, height, isImg2Img, preciseRefCount);
+  const unitFree = getUnitPointsCost(runtime, session, options2, width, height, isImg2Img, preciseRefCount, false, resolvedModel);
   const perImage = [];
   if (!runtime.membershipSystem.isNai5Model(resolvedModel)) {
     for (let i = 0; i < count; i++) perImage.push(unitFree);
@@ -3651,7 +3681,7 @@ function calculateTaskPointsCost(runtime, session, options2, width, height, isIm
   }
   const overageCount = runtime.membershipSystem.getNai5OverageCount(uid, count);
   const freeCount = count - overageCount;
-  const unitOverage = overageCount > 0 ? getUnitPointsCost(runtime, session, options2, width, height, isImg2Img, preciseRefCount, true) : unitFree;
+  const unitOverage = overageCount > 0 ? getUnitPointsCost(runtime, session, options2, width, height, isImg2Img, preciseRefCount, true, resolvedModel) : unitFree;
   for (let i = 0; i < freeCount; i++) perImage.push(unitFree);
   for (let i = 0; i < overageCount; i++) perImage.push(unitOverage);
   return {
@@ -3929,6 +3959,23 @@ function extractOptionsFromUndesired(undesired) {
 __name(extractOptionsFromUndesired, "extractOptionsFromUndesired");
 function registerNovelai(ctx, config, runtime) {
   const { membershipSystem, queueSystem, useFilter, useBackend, thirdParty, noImage, some, step, resolution: resolution2 } = runtime;
+  const recentCommandMessages = /* @__PURE__ */ new Map();
+  const commandDedupWindow = 3e4;
+  const isDuplicateCommand = /* @__PURE__ */ __name((session) => {
+    const messageId = session.messageId;
+    if (!messageId) return false;
+    const now = Date.now();
+    for (const [key2, timestamp] of recentCommandMessages) {
+      if (now - timestamp > commandDedupWindow) recentCommandMessages.delete(key2);
+    }
+    const key = [session.platform, session.selfId, session.channelId, session.userId, messageId].join(":");
+    if (recentCommandMessages.has(key)) {
+      ctx.logger.warn(`检测到重复绘图消息，已忽略：messageId=${messageId}`);
+      return true;
+    }
+    recentCommandMessages.set(key, now);
+    return false;
+  }, "isDuplicateCommand");
   ctx.before("attach", (session) => {
     session.stripped.content = session.stripped.content.replace(
       /^(\S*?nai4)[\u2010-\u2015\u2212\uFE63\uFF0D](5c?)(?=\s|$)/i,
@@ -3939,6 +3986,7 @@ function registerNovelai(ctx, config, runtime) {
     hidden: /* @__PURE__ */ __name(() => config.type === "naifu", "hidden"),
     type: ["token", "login"].includes(config.type) ? scheduler.nai : config.type === "sd-webui" ? scheduler.sd : config.type === "stable-horde" ? scheduler.horde : []
   }).option("decrisper", "-D", { hidden: thirdParty }).option("undesired", "-u <undesired:text>").option("noTranslator", "-T", { hidden: /* @__PURE__ */ __name(() => !ctx.translator || !config.translator, "hidden") }).option("iterations", "-i <iterations:posint>", { fallback: 1, hidden: /* @__PURE__ */ __name(() => config.maxIterations <= 1, "hidden") }).option("batch", "-b <batch:option>", { fallback: 1, hidden: /* @__PURE__ */ __name(() => config.maxIterations <= 1, "hidden") }).option("chars", "-K <chars>").option("inpaint", "-M", { hidden: thirdParty }).option("preciseRef", "-P", { hidden: thirdParty }).option("preciseRefParams", "-p <params:string>").action(async ({ session, options: options2, name: name2 }, ...prompts) => {
+    if (isDuplicateCommand(session)) return;
     let input = prompts.join(" ");
     const imageUrls = import_koishi9.h.select(session.elements ?? [], "img").map((el) => el.attrs.src);
     if (imageUrls.length) {
@@ -4289,26 +4337,9 @@ function registerRedraw(ctx, config, runtime) {
       try {
         const currentChannelId = session.channelId;
         const commandId = Date.now() % 1e4;
-        if (config.tokenStrategy === "round-robin" && Array.isArray(ctx.config.token)) {
-          if (!ctx.runtime) {
-            ctx.runtime = { currentTokenIndex: 0 };
-          }
-          const oldTokenIndex = ctx.runtime.currentTokenIndex;
-          const lastRedrawTime = queueSystem.getLastRedrawTime();
-          const timeSinceLastRedraw = now - lastRedrawTime;
-          let newTokenIndex;
-          if (timeSinceLastRedraw < 5e3) {
-            const timeOffset = timeSinceLastRedraw % ctx.config.token.length;
-            const randomOffset = Math.floor(Math.random() * ctx.config.token.length);
-            const baseIndex = (oldTokenIndex + timeOffset + randomOffset + commandId) % ctx.config.token.length;
-            newTokenIndex = queueSystem.getUniqueTokenIndex(baseIndex, ctx.config.token.length);
-          } else {
-            const randomOffset = Math.floor(Math.random() * ctx.config.token.length);
-            newTokenIndex = (oldTokenIndex + randomOffset + 1) % ctx.config.token.length;
-          }
-          ctx.runtime.currentTokenIndex = newTokenIndex;
+        if (Array.isArray(ctx.config.token)) {
           queueSystem.setLastRedrawTime(now);
-          ctx.logger.debug(`重画命令(${commandId})开始，token 索引从 ${oldTokenIndex} 更新为 ${newTokenIndex}，间隔: ${timeSinceLastRedraw}ms`);
+          ctx.logger.debug(`重画命令(${commandId})开始，token 使用策略: ${config.tokenStrategy || "round-robin"}`);
         }
         const addRedrawTask = /* @__PURE__ */ __name(async (index, delay = 0) => {
           if (delay > 0) {
@@ -4324,61 +4355,12 @@ function registerRedraw(ctx, config, runtime) {
           taskSession.isRedraw = true;
           const taskUniqueId = commandId * 100 + index;
           if (Array.isArray(ctx.config.token)) {
-            if (config.tokenStrategy === "parallel") {
-              taskSession.runtime = {
-                currentTokenIndex: void 0,
-                tokenUsage: {},
-                // 空对象，避免共享引用
-                _timeStamp: Date.now() + index,
-                _taskId: taskUniqueId
-              };
-              ctx.logger.debug(`为重画任务 ${taskUniqueId} 创建独立的session对象，确保能够独立获取token`);
-            } else if (config.tokenStrategy === "round-robin") {
-              if (ctx.runtime) {
-                let forcedTokenIndex;
-                if (ctx.config.token.length <= 1) {
-                  forcedTokenIndex = 0;
-                } else {
-                  const baseIndex = ctx.runtime.currentTokenIndex;
-                  const taskOffset = (index * 3 + taskUniqueId) % ctx.config.token.length;
-                  const candidateIndex = (baseIndex + taskOffset) % ctx.config.token.length;
-                  forcedTokenIndex = queueSystem.getUniqueTokenIndex(candidateIndex, ctx.config.token.length);
-                  ctx.logger.debug(`重画任务 ${taskUniqueId} token索引计算: 基础=${baseIndex}, 任务偏移=${taskOffset}, 最终=${forcedTokenIndex}`);
-                }
-                taskSession.runtime = {
-                  _timeStamp: Date.now() + index,
-                  _redraw: true,
-                  _forcedTokenIndex: forcedTokenIndex,
-                  // 强制指定 token 索引
-                  _taskIndex: index,
-                  // 任务索引
-                  _taskId: taskUniqueId
-                  // 任务唯一ID
-                };
-                ctx.logger.debug(`为重画任务 ${taskUniqueId} 强制指定 token 索引: ${forcedTokenIndex}`);
-              } else {
-                taskSession.runtime = {
-                  _timeStamp: Date.now() + index,
-                  _redraw: true,
-                  _taskId: taskUniqueId
-                };
-                ctx.logger.debug(`为重画任务 ${taskUniqueId} 创建轮询session对象，将使用下一个可用token`);
-              }
-            } else if (config.tokenStrategy === "random") {
-              taskSession.runtime = {
-                _timeStamp: Date.now() + index,
-                _redraw: true,
-                _taskId: taskUniqueId
-              };
-              ctx.logger.debug(`为重画任务 ${taskUniqueId} 创建随机策略session对象，将随机选择token`);
-            } else if (config.tokenStrategy === "fallback") {
-              taskSession.runtime = {
-                _timeStamp: Date.now() + index,
-                _redraw: true,
-                _taskId: taskUniqueId
-              };
-              ctx.logger.debug(`为重画任务 ${taskUniqueId} 创建备用策略session对象，将从第一个token开始尝试`);
-            }
+            taskSession.runtime = {
+              _timeStamp: Date.now() + index,
+              _redraw: true,
+              _taskIndex: index,
+              _taskId: taskUniqueId
+            };
           }
           const taskOptions = { ...lastTask.options };
           if (config.membershipEnabled && config.pointsEnabled) {
@@ -5709,7 +5691,7 @@ var usage = `
 * **智能审核**：集成腾讯 AI 或 API4AI，自动过滤违规内容。
 
 ### 🗓️ 开发计划
-- [√] **点数控制系统**：精细化控制用户点数消耗进行本地计算，可能存在误差，请以实际扣费为准。
+- [√] **点数控制系统**：按 NovelAI 官网前端公式预扣本地点数（V5 为 V4.5 的 1.5 倍）。实际扣费以 NovelAI 账户为准。
 - [x] ~~**氛围传输功能**：实现novelai官网的氛围传输功能。v4版本的风味传输api不允许直接发图，需要先去官网生成对应文件，我做不到。~~
 - [√] **角色参考功能**：实现novelai官网的角色参考功能。（已被精确参考替代）
 ---

package/lib/membershipSystem.d.ts

@@ -18,8 +18,14 @@ export declare class MembershipSystem {
     syncUserToDB(userId: string): Promise<void>;
     saveUserData(): Promise<void>;
     /**
-     * 计算预估消耗点数（基于 Opus 套餐）
-     * 社区逆向工程的 NAI Anlas 估算公式
+     * 按 NovelAI 官网前端公式计算 Anlas。
+     * 来源：novelai.net/_next/static/chunks/1052-*.js
+     * SDXL / V4 / V4.5 / V5：
+     *   M = ceil(2.951823174884865e-6 * pixels + 5.753298233447344e-7 * pixels * steps)
+     *   M *= sm_dyn ? 1.4 : smea ? 1.2 : 1
+     *   V5 再乘 1.5
+     *   cost = max(ceil(M * strength), 2)
+     * Opus 免费：无角色参考、像素 ≤ 1048576、步数 ≤ 28 时第一张为 0。
      */
     calculatePointsCost(params: {
         width: number;
@@ -31,6 +37,7 @@ export declare class MembershipSystem {
         isImg2Img?: boolean;
         preciseRefCount?: number;
         chargeOpusFreeRange?: boolean;
+        model?: string;
     }): number;
     /**
      * 导演工具点数计算

package/lib/queueSystem.d.ts

@@ -24,16 +24,16 @@ export declare class QueueSystem {
         pointsCost?: number;
     }>;
     private lastRedrawTime;
-    private usedTokenIndices;
     private redrawLock;
     private redrawWaitQueue;
     maxConcurrentTasks: number;
     private membershipSystem;
     private tokenPool;
+    private tokenIndices;
+    private nextTokenIndex;
     constructor(ctx: Context, config: Config, generateImageFn: (session: Session<'authority'>, options: any, input: string) => Promise<any>, membershipSystem?: MembershipSystem, initialTokenUsage?: Dict<boolean>);
     acquireRedrawLock(): Promise<void>;
     releaseRedrawLock(): void;
-    getUniqueTokenIndex(currentIndex: number, tokenCount: number): number;
     private acquireTokenIndex;
     private releaseTokenIndex;
     borrowTokenIndex(): number | null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-hhs-huatu",
   "description": "Generate images by diffusion models",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -139,13 +139,14 @@ nai4-5 <提示词> -P -p "cs,1,1;c,0.8,0.9"
 
 ### 💰 点数控制系统
 
-基于本地算法精确模拟各功能的 Anlas 消耗并进行预扣费，确保消耗透明且防止恶意刷图。
+按 NovelAI 官网前端公式模拟 Anlas 消耗并预扣费，确保消耗透明且防止恶意刷图。
 
 **计费细则：**
-- **默认消耗**：根据生成目标的像素总数进行基础扣费。
-- **SMEA / DYN 加成**：一旦开启基于采样算法的优化SMEA 单独开启（nai -S tags） **1.2 倍** 放大，同时开启SMEA 和 DYN 消耗（nai -d tags） **1.4 倍** 放大。
-- **以图生图**：系统会根据设定的去噪强度（`strength`）等比缩放扣除额度。
-- **精确参考（-P）**：由于其附带复杂的预处理，每挂载一张参考图均会**额外扣除 5 点数**。
+- **默认消耗**：`ceil(2.951823174884865e-6 × 像素 + 5.753298233447344e-7 × 像素 × 步数)`。
+- **V5（nai5 / nai5c）**：在上述结果上再乘 **1.5**。例如 832×1216、28 步超额时，V4.5 为 20、V5 为 30。
+- **SMEA / DYN 加成**：SMEA 单独开启 **1.2 倍**，同时开启 SMEA 和 DYN **1.4 倍**。
+- **以图生图**：按去噪强度（`strength`）缩放后向上取整，最少 2 点。
+- **精确参考（-P）**：有参考图时取消 Opus 免费档，并每张参考图额外扣除 5 点数。
 - **导演工具（Director Tools）**：
   - 普清免扣：分辨率在 `1024×1024`（或 1,048,576 像素）及以下时，处理**免收基础点数**。
   - 高清计费：超过安全像素后根据公式 `像素数 ÷ 50000 - 1.8` 收取超额积分。

package/lib/NaiInpaintService.d.ts

@@ -1,31 +0,0 @@
-interface ProcessedImageResult {
-    cleanImage: Buffer;
-    dimmedImage: Buffer;
-    width: number;
-    height: number;
-}
-interface InpaintPayload {
-    input?: string;
-    model: string;
-    action: 'infill';
-    parameters: any;
-}
-export declare class NaiInpaintService {
-    /**
-     * 预处理输入图像
-     * 1. 移除 Alpha 通道 (强制 RGB)
-     * 2. 调整尺寸为 64 的倍数 (NovelAI 限制)
-     * 3. 生成一张变暗的引导图供用户涂抹
-     */
-    processInputImage(inputBuffer: Buffer): Promise<ProcessedImageResult>;
-    /**
-     * 从用户涂抹的图中提取蒙版
-     * 用户会在暗图上用白色画笔涂抹
-     */
-    extractMaskFromUserDrawing(cleanImageBuffer: Buffer, userDrawnBuffer: Buffer): Promise<Buffer>;
-    /**
-     * 构造 NovelAI API Payload
-     */
-    constructInpaintPayload(model: string, imageBase64: string, maskBase64: string, prompt: string, negativePrompt: string, params: any): InpaintPayload;
-}
-export {};

package/lib/imageService.d.ts

@@ -1,59 +0,0 @@
-/**
- * 将数值向下或向上对齐到 64 的倍数
- * @param value 原始数值
- * @param direction 对齐方向：'floor' 向下，'ceil' 向上
- */
-export declare function alignTo64Grid(value: number, direction: 'floor' | 'ceil'): number;
-/**
- * Buffer 转 Base64 字符串（不含 data URL 前缀）
- */
-export declare function bufferToBase64(buffer: Buffer): string;
-/**
- * 将图片尺寸调整为 64 的倍数
- * @param buffer 图片 ArrayBuffer
- * @returns 调整后的图片 Buffer 和尺寸
- */
-export declare function resizeToMultipleOf64(buffer: ArrayBuffer): Promise<{
-    buffer: Buffer;
-    width: number;
-    height: number;
-}>;
-/**
- * 将图片亮度降低（变暗），方便用户在上面涂白
- * @param buffer 原图 ArrayBuffer
- * @param brightness 亮度系数，默认 0.4（即降低到 40%）
- * @returns 变暗后的图片 Buffer
- */
-export declare function darkenImage(buffer: ArrayBuffer, brightness?: number): Promise<Buffer>;
-/**
- * 从用户涂抹的图片中生成 Inpainting 蒙版
- *
- * 处理流程：
- * 1. 灰度化 -> 阈值提取白色区域 -> 模糊 -> 再次阈值化
- *    这个流程可以平滑蒙版边缘，避免 AI 重绘时产生明显边界
- * 2. 计算白色区域的包围盒
- * 3. 将包围盒扩展至 64 的倍数对齐
- * 4. 生成最终蒙版
- *
- * @param buffer 用户发回的涂抹图片 ArrayBuffer
- * @returns 蒙版 Buffer、宽度、高度
- */
-export declare function createInpaintMask(buffer: ArrayBuffer): Promise<{
-    maskBuffer: Buffer;
-    width: number;
-    height: number;
-}>;
-/**
- * 创建精确的 Inpainting 蒙版（保留原始涂抹形状）
- *
- * 与 createInpaintMask 不同，此函数保留用户涂抹的精确形状，
- * 而不是扩展为矩形。适用于需要精确控制重绘区域的场景。
- *
- * @param buffer 用户发回的涂抹图片 ArrayBuffer
- * @returns 蒙版 Buffer、宽度、高度
- */
-export declare function createPreciseInpaintMask(buffer: ArrayBuffer): Promise<{
-    maskBuffer: Buffer;
-    width: number;
-    height: number;
-}>;

package/lib/infillPayload.d.ts

@@ -1,94 +0,0 @@
-/**
- * NovelAI Inpainting API Payload 构造器
- * 用于构建 infill 请求的参数
- */
-/**
- * Infill Payload 选项
- */
-export interface InfillOptions {
-    /** 基础模型名称（如 'nai-diffusion-3'，将自动添加 -inpainting 后缀） */
-    baseModel: string;
-    /** 正向提示词 */
-    prompt: string;
-    /** 负向提示词 */
-    negativePrompt?: string;
-    /** 原图 Base64（不含前缀） */
-    imageBase64: string;
-    /** 蒙版 Base64（不含前缀） */
-    maskBase64: string;
-    /** 重绘强度，默认 1.0 */
-    strength?: number;
-    /** 噪声强度，默认 0 */
-    noise?: number;
-    /** 生成种子 */
-    seed?: number;
-    /** CFG Scale */
-    scale?: number;
-    /** 采样器 */
-    sampler?: string;
-    /** 调度器 */
-    scheduler?: string;
-    /** 步数 */
-    steps?: number;
-    /** 图片宽度 */
-    width?: number;
-    /** 图片高度 */
-    height?: number;
-}
-/**
- * Infill API 请求 Payload
- */
-export interface InfillPayload {
-    model: string;
-    input: string;
-    action: 'infill';
-    parameters: {
-        image: string;
-        mask: string;
-        add_original_image: boolean;
-        strength: number;
-        noise: number;
-        seed: number;
-        prompt: string;
-        negative_prompt: string;
-        scale: number;
-        sampler: string;
-        noise_schedule?: string;
-        steps: number;
-        width: number;
-        height: number;
-        n_samples: number;
-        ucPreset: number;
-        qualityToggle: boolean;
-        params_version: number;
-        legacy: boolean;
-        [key: string]: any;
-    };
-}
-/**
- * 获取 Inpainting 模型名称
- * @param baseModel 基础模型名称
- * @returns 带 -inpainting 后缀的模型名称
- */
-export declare function getInpaintingModel(baseModel: string): string;
-/**
- * 检查模型是否支持 Inpainting
- * @param model 模型名称
- */
-export declare function supportsInpainting(model: string): boolean;
-/**
- * 构造 Infill 请求 Payload
- *
- * @param options 选项参数
- * @returns 完整的 Infill API 请求 Payload
- */
-export declare function constructInfillPayload(options: InfillOptions): InfillPayload;
-/**
- * 从 Buffer 创建 Infill Payload（便捷方法）
- *
- * @param options 选项参数（使用 Buffer 而非 Base64）
- */
-export declare function constructInfillPayloadFromBuffers(options: Omit<InfillOptions, 'imageBase64' | 'maskBase64'> & {
-    imageBuffer: Buffer;
-    maskBuffer: Buffer;
-}): InfillPayload;

package/lib/services/currency.d.ts

@@ -1,46 +0,0 @@
-import { Context, Session } from 'koishi';
-import { Config } from '../config';
-/**
- * 组合支付结果。
- * 当点数不足以支付费用时，缺口按兑换比例折算为外部货币补足（组合支付）。
- */
-export interface PayResult {
-    success: boolean;
-    /** 实际支付的点数 */
-    pointsPaid: number;
-    /** 实际支付的外部货币数量 */
-    currencyPaid: number;
-    /** 失败时（success=false）附带以下提示数据 */
-    pointsBalance?: number;
-    requiredPoints?: number;
-    currencyBalance?: number;
-    requiredCurrency?: number;
-}
-/**
- * 外部货币适配器。
- * 用于「点数不足时使用外部货币兜底支付」：直接读写外部数据库表（默认即
- * xiaohua-monetary 插件的 monetary 表）。外部货币的发放/刷新由对应插件管理，
- * 本插件仅负责消费（查询 / 扣减 / 退还）。
- */
-export declare class ExternalCurrency {
-    private ctx;
-    private config;
-    constructor(ctx: Context, config: Config);
-    private get fc();
-    /**
-     * 解析用户的 uid（对应 Koishi binding 表的 aid）。
-     * 优先使用 session.user.id（Koishi 在挂载用户时总是会加载 id 字段）；
-     * 无 session 时经 binding 表由 userId（platform:pid）反查。
-     */
-    static resolveUid(session?: Session, userId?: string): number | null;
-    /** 经 binding 表由 userId（platform:pid）反查 uid，查不到返回 null */
-    static resolveUidByUserId(ctx: Context, userId: string): Promise<number | null>;
-    /** 构造查询条件：按 uid + （可选的）货币类型 */
-    private buildQuery;
-    /** 查询用户外部货币余额，无记录视为 0；表/字段配置错误时记日志并按 0 处理（不免费放行） */
-    getBalance(uid: number): Promise<number>;
-    /** 扣减外部货币（原子 $.sub），余额不足返回 false */
-    deduct(uid: number, amount: number): Promise<boolean>;
-    /** 退还外部货币（原子 $.add；无记录时创建新记录，不丢钱） */
-    refund(uid: number, amount: number): Promise<void>;
-}