qwenproxy-cli 1.0.0 → 1.0.2

package/src/services/qwen-errors.ts

@@ -1,133 +1,133 @@
-import {
-  QwenProxyError,
-  UpstreamRateLimit,
-  UpstreamError,
-  AuthError,
-} from "../core/errors.ts";
-
-/**
- * Messages from the completion fetch that indicate a transient network or
- * first-byte stall. These must be treated as retryable so tryCreateStreamWithRetry
- * rotates to another account instead of failing with a terminal 500 that the
- * client has to retry manually (which looks like an infinite hang).
- */
-export function isRetryableFetchErrorMessage(message: string): boolean {
-  return (
-    message.includes("fetch failed") ||
-    message.includes("ECONNREFUSED") ||
-    message.includes("ETIMEDOUT") ||
-    message.includes("etimedout") ||
-    message.includes("ENOTFOUND") ||
-    message.includes("network") ||
-    message.includes("timed out waiting for response headers")
-  );
-}
-
-export class RetryableQwenStreamError extends UpstreamRateLimit {
-  readonly retryAfterMs: number;
-  /** Original upstream category; avoids exposing the inherited rate-limit code. */
-  upstreamCode?: string;
-
-  constructor(message: string, retryAfterMs: number) {
-    super(message);
-    this.name = "RetryableQwenStreamError";
-    this.retryAfterMs = retryAfterMs;
-  }
-}
-
-/**
- * The account-level personalization sync could not be confirmed. Agent
- * instructions ride ONLY the personalization channel (never inline in the
- * prompt), so an unconfirmed sync must fail the attempt — the retry policy
- * rotates to another account — instead of sending a request the model would
- * answer without any instructions or tools. Surfaces as 503 (service
- * degraded) if every account fails to sync.
- */
-export class PersonalizationSyncError extends QwenProxyError {
-  readonly statusCode = 503;
-  readonly type = "service_unavailable";
-  readonly code = "personalization_unavailable";
-
-  constructor(message: string) {
-    super(message);
-    this.name = "PersonalizationSyncError";
-  }
-}
-
-export class QwenUpstreamError extends UpstreamError {
-  readonly upstreamCode: string;
-  readonly upstreamStatus: number;
-
-  constructor(message: string, upstreamCode: string, upstreamStatus: number) {
-    super(message);
-    this.name = "QwenUpstreamError";
-    this.upstreamCode = upstreamCode;
-    this.upstreamStatus = upstreamStatus;
-  }
-}
-
-export class QwenSessionExpiredError extends AuthError {
-  readonly accountId: string;
-
-  constructor(message: string, accountId: string) {
-    super(message);
-    this.name = "QwenSessionExpiredError";
-    this.accountId = accountId;
-  }
-}
-
-export class QwenUpstreamUnavailableError extends RetryableQwenStreamError {
-  readonly httpStatusCode: number;
-
-  constructor(message: string, httpStatusCode: number) {
-    super(message, 5000);
-    this.name = "QwenUpstreamUnavailableError";
-    this.upstreamCode = "upstream_unavailable";
-    this.httpStatusCode = httpStatusCode;
-  }
-}
-
-export class QwenNetworkError extends RetryableQwenStreamError {
-  constructor(message: string) {
-    super(message, 3000);
-    this.name = "QwenNetworkError";
-    this.upstreamCode = "network_error";
-  }
-}
-
-/**
- * Return the meaningful upstream category for logs and OpenAI error payloads.
- * RetryableQwenStreamError inherits the rate-limit base class for legacy retry
- * handling, so its inherited `code` must not be used as the actual category.
- */
-export function getQwenErrorCode(error: unknown): string | undefined {
-  if (!error || typeof error !== "object") return undefined;
-
-  const typed = error as {
-    upstreamCode?: unknown;
-    code?: unknown;
-    message?: unknown;
-  };
-  if (typeof typed.upstreamCode === "string" && typed.upstreamCode) {
-    return typed.upstreamCode;
-  }
-
-  if (error instanceof QwenNetworkError) return "network_error";
-  if (error instanceof QwenUpstreamUnavailableError) {
-    return "upstream_unavailable";
-  }
-
-  if (error instanceof RetryableQwenStreamError) {
-    const message = typeof typed.message === "string" ? typed.message.toLowerCase() : "";
-    if (message.includes("chat is in progress")) return "chat_in_progress";
-    if (message.includes("not exist") || message.includes("does not exist")) {
-      return "chat_not_exist";
-    }
-    if (message.includes("anti-bot") || message.includes("captcha")) {
-      return "waf_challenge";
-    }
-    return "upstream_retryable";
-  }
-
-  return typeof typed.code === "string" && typed.code ? typed.code : undefined;
-}
+import {
+  QwenProxyError,
+  UpstreamRateLimit,
+  UpstreamError,
+  AuthError,
+} from "../core/errors.ts";
+
+/**
+ * Messages from the completion fetch that indicate a transient network or
+ * first-byte stall. These must be treated as retryable so tryCreateStreamWithRetry
+ * rotates to another account instead of failing with a terminal 500 that the
+ * client has to retry manually (which looks like an infinite hang).
+ */
+export function isRetryableFetchErrorMessage(message: string): boolean {
+  return (
+    message.includes("fetch failed") ||
+    message.includes("ECONNREFUSED") ||
+    message.includes("ETIMEDOUT") ||
+    message.includes("etimedout") ||
+    message.includes("ENOTFOUND") ||
+    message.includes("network") ||
+    message.includes("timed out waiting for response headers")
+  );
+}
+
+export class RetryableQwenStreamError extends UpstreamRateLimit {
+  readonly retryAfterMs: number;
+  /** Original upstream category; avoids exposing the inherited rate-limit code. */
+  upstreamCode?: string;
+
+  constructor(message: string, retryAfterMs: number) {
+    super(message);
+    this.name = "RetryableQwenStreamError";
+    this.retryAfterMs = retryAfterMs;
+  }
+}
+
+/**
+ * The account-level personalization sync could not be confirmed. Agent
+ * instructions ride ONLY the personalization channel (never inline in the
+ * prompt), so an unconfirmed sync must fail the attempt — the retry policy
+ * rotates to another account — instead of sending a request the model would
+ * answer without any instructions or tools. Surfaces as 503 (service
+ * degraded) if every account fails to sync.
+ */
+export class PersonalizationSyncError extends QwenProxyError {
+  readonly statusCode = 503;
+  readonly type = "service_unavailable";
+  readonly code = "personalization_unavailable";
+
+  constructor(message: string) {
+    super(message);
+    this.name = "PersonalizationSyncError";
+  }
+}
+
+export class QwenUpstreamError extends UpstreamError {
+  readonly upstreamCode: string;
+  readonly upstreamStatus: number;
+
+  constructor(message: string, upstreamCode: string, upstreamStatus: number) {
+    super(message);
+    this.name = "QwenUpstreamError";
+    this.upstreamCode = upstreamCode;
+    this.upstreamStatus = upstreamStatus;
+  }
+}
+
+export class QwenSessionExpiredError extends AuthError {
+  readonly accountId: string;
+
+  constructor(message: string, accountId: string) {
+    super(message);
+    this.name = "QwenSessionExpiredError";
+    this.accountId = accountId;
+  }
+}
+
+export class QwenUpstreamUnavailableError extends RetryableQwenStreamError {
+  readonly httpStatusCode: number;
+
+  constructor(message: string, httpStatusCode: number) {
+    super(message, 5000);
+    this.name = "QwenUpstreamUnavailableError";
+    this.upstreamCode = "upstream_unavailable";
+    this.httpStatusCode = httpStatusCode;
+  }
+}
+
+export class QwenNetworkError extends RetryableQwenStreamError {
+  constructor(message: string) {
+    super(message, 3000);
+    this.name = "QwenNetworkError";
+    this.upstreamCode = "network_error";
+  }
+}
+
+/**
+ * Return the meaningful upstream category for logs and OpenAI error payloads.
+ * RetryableQwenStreamError inherits the rate-limit base class for legacy retry
+ * handling, so its inherited `code` must not be used as the actual category.
+ */
+export function getQwenErrorCode(error: unknown): string | undefined {
+  if (!error || typeof error !== "object") return undefined;
+
+  const typed = error as {
+    upstreamCode?: unknown;
+    code?: unknown;
+    message?: unknown;
+  };
+  if (typeof typed.upstreamCode === "string" && typed.upstreamCode) {
+    return typed.upstreamCode;
+  }
+
+  if (error instanceof QwenNetworkError) return "network_error";
+  if (error instanceof QwenUpstreamUnavailableError) {
+    return "upstream_unavailable";
+  }
+
+  if (error instanceof RetryableQwenStreamError) {
+    const message = typeof typed.message === "string" ? typed.message.toLowerCase() : "";
+    if (message.includes("chat is in progress")) return "chat_in_progress";
+    if (message.includes("not exist") || message.includes("does not exist")) {
+      return "chat_not_exist";
+    }
+    if (message.includes("anti-bot") || message.includes("captcha")) {
+      return "waf_challenge";
+    }
+    return "upstream_retryable";
+  }
+
+  return typeof typed.code === "string" && typed.code ? typed.code : undefined;
+}

package/src/services/qwen-headers.ts

@@ -1,79 +1,79 @@
-import { v4 as uuidv4 } from "uuid";
-import { qwenUrl, qwenOrigin } from "./qwen-url.ts";
-import { config } from "../core/config.js";
-let dynamicWebVersion: string | null = null;
-
-export function updateQwenWebVersion(version?: string | null): void {
-  if (version && typeof version === "string" && /^\d+\.\d+\.\d+/.test(version)) {
-    dynamicWebVersion = version.trim();
-  }
-}
-
-export function getQwenWebVersion(): string {
-  return dynamicWebVersion || config.qwen.webVersion;
-}
-
-export const QWEN_WEB_VERSION = config.qwen.webVersion;
-export const DEFAULT_QWEN_USER_AGENT =
-  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/150.0.0.0 Safari/537.36";
-const QWEN_TIMEZONE_HEADER = new Date().toString().split(" (")[0];
-
-export interface BuildQwenHeadersOptions {
-  cookie: string;
-  userAgent?: string;
-  bxUa?: string;
-  bxUmidtoken?: string;
-  bxV?: string;
-  chatSessionId?: string | null;
-  /** Real browser client-hints captured by getBasicHeaders (anti-hardcoded). */
-  secChUa?: string;
-  secChUaMobile?: string;
-  secChUaPlatform?: string;
-  /** Real web bundle version captured from the browser request (anti-hardcoded). */
-  version?: string;
-  extra?: Record<string, string>;
-}
-
-export function buildQwenRequestHeaders(
-  opts: BuildQwenHeadersOptions,
-): Record<string, string> {
-  const headers: Record<string, string> = {
-    ...(opts.extra ?? {}),
-    Accept: "application/json",
-    "Accept-Language": "pt-BR,pt;q=0.9",
-    "Accept-Encoding": "gzip, deflate, br, zstd",
-    "Content-Type": "application/json",
-    Cookie: opts.cookie,
-    Origin: qwenOrigin(),
-    Referer:
-      opts.extra?.Referer ??
-      (opts.chatSessionId
-        ? qwenUrl(`/c/${encodeURIComponent(opts.chatSessionId)}`)
-        : qwenUrl("/")),
-    "Sec-Fetch-Dest": "empty",
-    "Sec-Fetch-Mode": "cors",
-    "Sec-Fetch-Site": "same-origin",
-    Connection: "keep-alive",
-    "User-Agent": opts.userAgent || DEFAULT_QWEN_USER_AGENT,
-    "X-Request-Id": uuidv4(),
-    "bx-v": opts.bxV || "2.5.37",
-    source: "web",
-    version: opts.version || getQwenWebVersion(),
-    timezone: opts.extra?.timezone || new Date().toString().split(" (")[0],
-    // Use the real browser client-hints when captured (anti-hardcoded); fall
-    // back to the static fingerprint otherwise.
-    "sec-ch-ua": opts.secChUa || '"Google Chrome";v="150", "Chromium";v="150", "Not.A/Brand";v="99"',
-    "sec-ch-ua-mobile": opts.secChUaMobile || "?0",
-    "sec-ch-ua-platform": opts.secChUaPlatform || '"Windows"',
-  };
-
-  // The real chat.qwen.ai client sends ONLY bx-v on API requests — the WAF
-  // carries bx-ua/bx-umidtoken as browser cookies, not headers. Match that
-  // unless QWEN_SEND_BX_UA=true restores the legacy injection.
-  if (config.qwen.sendBxUa) {
-    if (opts.bxUa) headers["bx-ua"] = opts.bxUa;
-    if (opts.bxUmidtoken) headers["bx-umidtoken"] = opts.bxUmidtoken;
-  }
-
-  return headers;
-}
+import { v4 as uuidv4 } from "uuid";
+import { qwenUrl, qwenOrigin } from "./qwen-url.ts";
+import { config } from "../core/config.js";
+let dynamicWebVersion: string | null = null;
+
+export function updateQwenWebVersion(version?: string | null): void {
+  if (version && typeof version === "string" && /^\d+\.\d+\.\d+/.test(version)) {
+    dynamicWebVersion = version.trim();
+  }
+}
+
+export function getQwenWebVersion(): string {
+  return dynamicWebVersion || config.qwen.webVersion;
+}
+
+export const QWEN_WEB_VERSION = config.qwen.webVersion;
+export const DEFAULT_QWEN_USER_AGENT =
+  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/150.0.0.0 Safari/537.36";
+const QWEN_TIMEZONE_HEADER = new Date().toString().split(" (")[0];
+
+export interface BuildQwenHeadersOptions {
+  cookie: string;
+  userAgent?: string;
+  bxUa?: string;
+  bxUmidtoken?: string;
+  bxV?: string;
+  chatSessionId?: string | null;
+  /** Real browser client-hints captured by getBasicHeaders (anti-hardcoded). */
+  secChUa?: string;
+  secChUaMobile?: string;
+  secChUaPlatform?: string;
+  /** Real web bundle version captured from the browser request (anti-hardcoded). */
+  version?: string;
+  extra?: Record<string, string>;
+}
+
+export function buildQwenRequestHeaders(
+  opts: BuildQwenHeadersOptions,
+): Record<string, string> {
+  const headers: Record<string, string> = {
+    ...(opts.extra ?? {}),
+    Accept: "application/json",
+    "Accept-Language": "pt-BR,pt;q=0.9",
+    "Accept-Encoding": "gzip, deflate, br, zstd",
+    "Content-Type": "application/json",
+    Cookie: opts.cookie,
+    Origin: qwenOrigin(),
+    Referer:
+      opts.extra?.Referer ??
+      (opts.chatSessionId
+        ? qwenUrl(`/c/${encodeURIComponent(opts.chatSessionId)}`)
+        : qwenUrl("/")),
+    "Sec-Fetch-Dest": "empty",
+    "Sec-Fetch-Mode": "cors",
+    "Sec-Fetch-Site": "same-origin",
+    Connection: "keep-alive",
+    "User-Agent": opts.userAgent || DEFAULT_QWEN_USER_AGENT,
+    "X-Request-Id": uuidv4(),
+    "bx-v": opts.bxV || "2.5.37",
+    source: "web",
+    version: opts.version || getQwenWebVersion(),
+    timezone: opts.extra?.timezone || new Date().toString().split(" (")[0],
+    // Use the real browser client-hints when captured (anti-hardcoded); fall
+    // back to the static fingerprint otherwise.
+    "sec-ch-ua": opts.secChUa || '"Google Chrome";v="150", "Chromium";v="150", "Not.A/Brand";v="99"',
+    "sec-ch-ua-mobile": opts.secChUaMobile || "?0",
+    "sec-ch-ua-platform": opts.secChUaPlatform || '"Windows"',
+  };
+
+  // The real chat.qwen.ai client sends ONLY bx-v on API requests — the WAF
+  // carries bx-ua/bx-umidtoken as browser cookies, not headers. Match that
+  // unless QWEN_SEND_BX_UA=true restores the legacy injection.
+  if (config.qwen.sendBxUa) {
+    if (opts.bxUa) headers["bx-ua"] = opts.bxUa;
+    if (opts.bxUmidtoken) headers["bx-umidtoken"] = opts.bxUmidtoken;
+  }
+
+  return headers;
+}