mslxdff 0.1.170 → 0.1.172

package/src/providers/codearts/concurrency.js

@@ -0,0 +1,34 @@
+// codearts 上游硬限并发：FIFO 排队闸，超限请求等前面的让出额度再发（该上游对并发极敏感）。
+export function createGate({ limit = 3 } = {}) {
+  const cap = Number.isFinite(limit) && limit > 0 ? Math.floor(limit) : Infinity;
+  let active = 0;
+  const waiters = [];
+
+  function release() {
+    active--;
+    const w = waiters.shift();
+    if (w) w();
+  }
+
+  async function run(fn, onWait) {
+    if (active >= cap) {
+      const t0 = Date.now();
+      const queued = waiters.length + 1;
+      await new Promise((resolve) => waiters.push(resolve));
+      if (onWait) { try { onWait({ waitedMs: Date.now() - t0, queued, limit: cap }); } catch {} }
+    }
+    active++;
+    try {
+      return await fn();
+    } finally {
+      release();
+    }
+  }
+
+  return {
+    run,
+    stats: () => ({ active, queued: waiters.length, limit: cap }),
+    get active() { return active; },
+    get queued() { return waiters.length; },
+  };
+}

package/src/providers/codearts/index.js

@@ -4,12 +4,13 @@ import { createKeyRing } from "../keyring.js";
 import { loadProviderKeys, loadProviderBaseUrl, saveProviderConfig } from "../../state.js";
 import { getUndici, createAgent, envInt, collectApiKeysGeneric } from "../base.js";
 import { compatFetch } from "../../compat.js";
-import { logDir } from "../../logs.js";
+import { logDir, appendEvent } from "../../logs.js";
 import { join } from "node:path";
 import { SNAP_BASE, MODELS_CACHE_TTL_MS } from "./const.js";
 import { createAuthPool } from "./auth-pool.js";
 import { createCatalog, discoverAccountModels } from "./models.js";
 import { createChatService } from "./chat.js";
+import { createGate } from "./concurrency.js";
 
 const { UndiciFetch } = getUndici();
 
@@ -30,6 +31,7 @@ export function createCodeartsProvider({
   snapBase,
   connectTimeoutMs = envInt("MSLXDFF_CODEARTS_TIMEOUT_MS", 30_000),
   cooldownMs = envInt("MSLXDFF_CODEARTS_COOLDOWN_MS", 30_000),
+  maxConcurrent = Number.parseInt(process.env.MSLXDFF_CODEARTS_MAX_CONCURRENT ?? "", 10) || 3,
   autoClaim = process.env.MSLXDFF_CODEARTS_AUTO_CLAIM !== "0",
   fetchImpl,
   file,
@@ -59,6 +61,8 @@ export function createCodeartsProvider({
   };
   const pool = createAuthPool({ keys: allKeys, fetchImpl, stsHost, clock, saveFn });
   const catalog = createCatalog();
+  // 该上游对并发极敏感（实测 >3 即坏号/限流）；超限请求 FIFO 排队，不拒绝。
+  const gate = createGate({ limit: maxConcurrent });
 
   let agent = null; let dispatcher = null;
   try {
@@ -75,9 +79,12 @@ export function createCodeartsProvider({
     id, baseUrl: chatSvcBase, chatPath, fetchImpl, dispatcher, authPool: pool, catalog, connectTimeoutMs, clock,
   });
 
+  const onWait = (info) => {
+    try { appendEvent({ type: "codearts-queue", ...info }); } catch {}
+  };
   async function chat(body, opts = {}) {
     if (!ring.size) throw new Error("codearts: missing credential — run: mslxdff -provider codearts login");
-    return chatSvc.runChat(body, ring, opts);
+    return gate.run(() => chatSvc.runChat(body, ring, opts), onWait);
   }
   async function chatWithKeys(body, keys, opts = {}) {
     const blobs = (keys || []).filter((k) => typeof k === "string" && k.trim().startsWith("{"));
@@ -85,7 +92,7 @@ export function createCodeartsProvider({
     const tmpRing = createKeyRing(blobs, { cooldownMs });
     const tmpPool = createAuthPool({ keys: blobs, fetchImpl, stsHost, clock }); // 借用凭据不写回本节点
     const tmpSvc = createChatService({ id, baseUrl: chatSvcBase, chatPath, fetchImpl, dispatcher: null, authPool: tmpPool, catalog, connectTimeoutMs, clock });
-    return tmpSvc.runChat(body, tmpRing, opts);
+    return gate.run(() => tmpSvc.runChat(body, tmpRing, opts), onWait);
   }
 
   // 三路发现（主账号）；结果写目录（benefit 判定按账号隔离）
@@ -155,6 +162,7 @@ export function createCodeartsProvider({
     baseUrl: resolvedBase,
     _pool: pool,
     _catalog: catalog,
+    _gate: gate,
     _snapshotPath: join(logDir(), "codearts-models.json"),
   };
 }

package/src/providers/globalqwenwork/cosy.js

@@ -1,123 +1,123 @@
-// cosy.js（COSY 会话 + 签名头）— vendor 自 src/providers/qwenwork/cosy.js 逐字搬；
-// 本目录 import 全为相对路径，自动绑定本目录 constants/crypto/rsa。线上头 x-qwenwork-* 与 cn 同名，**禁止改名**（实测 .ai 接受）。
-// 关键不变式（改动即 403）：
-//  · identity/payload 都必须 key 升序紧凑 JSON（sortedCompact）
-//  · 签名 = md5(payloadB64 \n cosyKey \n date \n body \n pathSig)，pathSig 去 /algo 前缀、不含 query
-//  · authorization = `Bearer COSY.${payloadB64}.${sig}`；payloadB64 是**标准 base64（带 padding）**
-//  · 同一 requestId 重放会被上游判 `code 103 Duplicate request`
-import { uuid, b64, b64url, utf8, aesCbcEncrypt, md5 } from "./crypto.js";
-import { rsaPkcs1Encrypt } from "./rsa.js";
-import {
-  COSY_VERSION, IDE_VERSION, RELEASE_VERSION, BUILD, CLIENT_TYPE,
-  BUSINESS_PRODUCT, BUSINESS_TYPE, SCENE, MACHINE_OS, UA,
-} from "./constants.js";
-
-const cache = new Map();
-
-function sortedCompact(obj) {
-  const keys = Object.keys(obj).sort();
-  let out = "{";
-  for (let i = 0; i < keys.length; i++) {
-    if (i > 0) out += ",";
-    out += JSON.stringify(keys[i]) + ":" + JSON.stringify(obj[keys[i]]);
-  }
-  return out + "}";
-}
-
-function newSession(account) {
-  const machineID = uuid();
-  const seed = (uuid() + uuid()).slice(0, 50);
-  const machineToken = b64url(utf8(seed));
-  const machineType = uuid().replace(/-/g, "").slice(0, 18);
-  const tempKey = uuid().replace(/-/g, "").slice(0, 16);
-
-  const identity = sortedCompact({
-    uid: account.uid || "",
-    aid: account.uid || "",
-    name: account.nickname || "",
-    email: account.email || "",
-    security_oauth_token: account.accessToken,
-  });
-
-  return {
-    machineID,
-    machineToken,
-    machineType,
-    tempKey,
-    cosyKey: rsaPkcs1Encrypt(utf8(tempKey)),
-    info: b64(aesCbcEncrypt(utf8(identity), utf8(tempKey))),
-    accessToken: account.accessToken,
-  };
-}
-
-export function sessionFor(account) {
-  if (!account || !account.accessToken) throw new Error("cosy: empty access token");
-  const key = account.id || account.uid || account.accessToken.slice(0, 16);
-  const hit = cache.get(key);
-  if (hit && hit.accessToken === account.accessToken) return hit;
-  if (cache.size > 128) cache.clear();
-  const sess = newSession(account);
-  cache.set(key, sess);
-  return sess;
-}
-
-export function invalidateSession(account) {
-  const key = account && (account.id || account.uid);
-  if (key) cache.delete(key);
-}
-
-function pathSig(rawURL) {
-  const u = new URL(rawURL);
-  let p = u.pathname;
-  if (p.startsWith("/algo")) p = p.slice("/algo".length);
-  return p;
-}
-
-export function signHeaders(account, body, rawURL, modelKey, accept) {
-  const sess = sessionFor(account);
-  const payload = sortedCompact({
-    cosyVersion: COSY_VERSION,
-    ideVersion: IDE_VERSION,
-    info: sess.info,
-    requestId: uuid(),
-    version: "v1",
-  });
-  const payloadB64 = b64(utf8(payload));
-  const date = Math.floor(Date.now() / 1000).toString();
-  const sig = md5(`${payloadB64}\n${sess.cosyKey}\n${date}\n${body}\n${pathSig(rawURL)}`);
-
-  const headers = {
-    accept: accept || "text/event-stream",
-    "content-type": "application/json",
-    "user-agent": UA,
-    "x-request-id": uuid(),
-    "x-qwenwork-version": IDE_VERSION,
-    "x-qwenwork-release-version": RELEASE_VERSION,
-    "x-qwenwork-build": BUILD,
-    "x-qwenwork-platform": "win32",
-    "x-qwenwork-arch": "x64",
-    "x-qwenwork-channel": "stable",
-    "cosy-version": COSY_VERSION,
-    "cosy-clienttype": CLIENT_TYPE,
-    "cosy-business-product": BUSINESS_PRODUCT,
-    "cosy-business-type": BUSINESS_TYPE,
-    "cosy-scene": SCENE,
-    "cosy-machineos": MACHINE_OS,
-    "login-version": "v2",
-    authorization: `Bearer COSY.${payloadB64}.${sig}`,
-    "cosy-key": sess.cosyKey,
-    "cosy-user": account.uid || "",
-    "cosy-date": date,
-    "cosy-machineid": sess.machineID,
-    "accept-encoding": "identity",
-    connection: "keep-alive",
-    "cache-control": "no-cache",
-  };
-  if (modelKey) {
-    headers["x-model-key"] = modelKey;
-    headers["x-model-source"] = "system";
-  }
-  return headers;
-}
-
-// globalqwenwork 变体（国际站 gateway.qwenwork.ai）：协议与 cn 逐字同构，2026-10-01 现网实测签名/请求 200 — 见 docs/adr/0041-globalqwenwork-international-provider.md
+// cosy.js（COSY 会话 + 签名头）— vendor 自 src/providers/qwenwork/cosy.js 逐字搬；
+// 本目录 import 全为相对路径，自动绑定本目录 constants/crypto/rsa。线上头 x-qwenwork-* 与 cn 同名，**禁止改名**（实测 .ai 接受）。
+// 关键不变式（改动即 403）：
+//  · identity/payload 都必须 key 升序紧凑 JSON（sortedCompact）
+//  · 签名 = md5(payloadB64 \n cosyKey \n date \n body \n pathSig)，pathSig 去 /algo 前缀、不含 query
+//  · authorization = `Bearer COSY.${payloadB64}.${sig}`；payloadB64 是**标准 base64（带 padding）**
+//  · 同一 requestId 重放会被上游判 `code 103 Duplicate request`
+import { uuid, b64, b64url, utf8, aesCbcEncrypt, md5 } from "./crypto.js";
+import { rsaPkcs1Encrypt } from "./rsa.js";
+import {
+  COSY_VERSION, IDE_VERSION, RELEASE_VERSION, BUILD, CLIENT_TYPE,
+  BUSINESS_PRODUCT, BUSINESS_TYPE, SCENE, MACHINE_OS, UA,
+} from "./constants.js";
+
+const cache = new Map();
+
+function sortedCompact(obj) {
+  const keys = Object.keys(obj).sort();
+  let out = "{";
+  for (let i = 0; i < keys.length; i++) {
+    if (i > 0) out += ",";
+    out += JSON.stringify(keys[i]) + ":" + JSON.stringify(obj[keys[i]]);
+  }
+  return out + "}";
+}
+
+function newSession(account) {
+  const machineID = uuid();
+  const seed = (uuid() + uuid()).slice(0, 50);
+  const machineToken = b64url(utf8(seed));
+  const machineType = uuid().replace(/-/g, "").slice(0, 18);
+  const tempKey = uuid().replace(/-/g, "").slice(0, 16);
+
+  const identity = sortedCompact({
+    uid: account.uid || "",
+    aid: account.uid || "",
+    name: account.nickname || "",
+    email: account.email || "",
+    security_oauth_token: account.accessToken,
+  });
+
+  return {
+    machineID,
+    machineToken,
+    machineType,
+    tempKey,
+    cosyKey: rsaPkcs1Encrypt(utf8(tempKey)),
+    info: b64(aesCbcEncrypt(utf8(identity), utf8(tempKey))),
+    accessToken: account.accessToken,
+  };
+}
+
+export function sessionFor(account) {
+  if (!account || !account.accessToken) throw new Error("cosy: empty access token");
+  const key = account.id || account.uid || account.accessToken.slice(0, 16);
+  const hit = cache.get(key);
+  if (hit && hit.accessToken === account.accessToken) return hit;
+  if (cache.size > 128) cache.clear();
+  const sess = newSession(account);
+  cache.set(key, sess);
+  return sess;
+}
+
+export function invalidateSession(account) {
+  const key = account && (account.id || account.uid);
+  if (key) cache.delete(key);
+}
+
+function pathSig(rawURL) {
+  const u = new URL(rawURL);
+  let p = u.pathname;
+  if (p.startsWith("/algo")) p = p.slice("/algo".length);
+  return p;
+}
+
+export function signHeaders(account, body, rawURL, modelKey, accept) {
+  const sess = sessionFor(account);
+  const payload = sortedCompact({
+    cosyVersion: COSY_VERSION,
+    ideVersion: IDE_VERSION,
+    info: sess.info,
+    requestId: uuid(),
+    version: "v1",
+  });
+  const payloadB64 = b64(utf8(payload));
+  const date = Math.floor(Date.now() / 1000).toString();
+  const sig = md5(`${payloadB64}\n${sess.cosyKey}\n${date}\n${body}\n${pathSig(rawURL)}`);
+
+  const headers = {
+    accept: accept || "text/event-stream",
+    "content-type": "application/json",
+    "user-agent": UA,
+    "x-request-id": uuid(),
+    "x-qwenwork-version": IDE_VERSION,
+    "x-qwenwork-release-version": RELEASE_VERSION,
+    "x-qwenwork-build": BUILD,
+    "x-qwenwork-platform": "win32",
+    "x-qwenwork-arch": "x64",
+    "x-qwenwork-channel": "stable",
+    "cosy-version": COSY_VERSION,
+    "cosy-clienttype": CLIENT_TYPE,
+    "cosy-business-product": BUSINESS_PRODUCT,
+    "cosy-business-type": BUSINESS_TYPE,
+    "cosy-scene": SCENE,
+    "cosy-machineos": MACHINE_OS,
+    "login-version": "v2",
+    authorization: `Bearer COSY.${payloadB64}.${sig}`,
+    "cosy-key": sess.cosyKey,
+    "cosy-user": account.uid || "",
+    "cosy-date": date,
+    "cosy-machineid": sess.machineID,
+    "accept-encoding": "identity",
+    connection: "keep-alive",
+    "cache-control": "no-cache",
+  };
+  if (modelKey) {
+    headers["x-model-key"] = modelKey;
+    headers["x-model-source"] = "system";
+  }
+  return headers;
+}
+
+// globalqwenwork 变体（国际站 gateway.qwenwork.ai）：协议与 cn 逐字同构，2026-10-01 现网实测签名/请求 200 — 见 docs/adr/0041-globalqwenwork-international-provider.md