qwenproxy-cli 1.0.0 → 1.0.2

package/src/core/stream-registry.ts

@@ -1,96 +1,96 @@
-import { metrics } from "./metrics.js";
-
-const activeStreams = new Map<
-  string,
-  {
-    abortController: AbortController;
-    accountId: string;
-    uiSessionId: string;
-    targetResponseId: string;
-    headers: Record<string, string>;
-    /** True once at least one model chunk reached the client. */
-    emittedChunk: boolean;
-  }
->();
-
-export function registerStream(
-  key: string,
-  entry: {
-    abortController: AbortController;
-    accountId: string;
-    uiSessionId: string;
-    targetResponseId: string;
-    headers: Record<string, string>;
-  },
-): void {
-  const existing = activeStreams.get(key);
-  if (existing && existing.abortController !== entry.abortController) {
-    existing.abortController.abort();
-  }
-
-  activeStreams.set(key, { emittedChunk: false, ...entry });
-  metrics.gauge("streams.active", activeStreams.size);
-}
-
-export function getStream(key: string): ReturnType<typeof activeStreams.get> {
-  return activeStreams.get(key);
-}
-
-export function getStreamKeysBySessionId(sessionId: string): string[] {
-  const keys: string[] = [];
-  for (const [key, entry] of activeStreams.entries()) {
-    if (entry.uiSessionId === sessionId) {
-      keys.push(key);
-    }
-  }
-  return keys;
-}
-
-export function getStreamKeyBySessionAndResponse(
-  sessionId: string,
-  responseId: string,
-): string | undefined {
-  for (const [key, entry] of activeStreams.entries()) {
-    if (
-      entry.uiSessionId === sessionId &&
-      entry.targetResponseId === responseId
-    ) {
-      return key;
-    }
-  }
-  return undefined;
-}
-
-export function removeStream(key: string): void {
-  activeStreams.delete(key);
-  metrics.gauge("streams.active", activeStreams.size);
-}
-
-/**
- * Mark a stream as having emitted at least one model chunk to the client.
- * The emit-aware supersede uses this to avoid killing a generation the client
- * has not consumed yet (e.g. a parallel title request racing the main stream).
- */
-export function markStreamEmitted(key: string): void {
-  const entry = activeStreams.get(key);
-  if (entry) {
-    entry.emittedChunk = true;
-  }
-}
-
-export function updateStreamTargetResponseId(
-  key: string,
-  targetResponseId: string,
-): void {
-  const entry = activeStreams.get(key);
-  if (entry) {
-    entry.targetResponseId = targetResponseId;
-  }
-}
-
-export function updateStreamSessionId(key: string, uiSessionId: string): void {
-  const entry = activeStreams.get(key);
-  if (entry) {
-    entry.uiSessionId = uiSessionId;
-  }
-}
+import { metrics } from "./metrics.js";
+
+const activeStreams = new Map<
+  string,
+  {
+    abortController: AbortController;
+    accountId: string;
+    uiSessionId: string;
+    targetResponseId: string;
+    headers: Record<string, string>;
+    /** True once at least one model chunk reached the client. */
+    emittedChunk: boolean;
+  }
+>();
+
+export function registerStream(
+  key: string,
+  entry: {
+    abortController: AbortController;
+    accountId: string;
+    uiSessionId: string;
+    targetResponseId: string;
+    headers: Record<string, string>;
+  },
+): void {
+  const existing = activeStreams.get(key);
+  if (existing && existing.abortController !== entry.abortController) {
+    existing.abortController.abort();
+  }
+
+  activeStreams.set(key, { emittedChunk: false, ...entry });
+  metrics.gauge("streams.active", activeStreams.size);
+}
+
+export function getStream(key: string): ReturnType<typeof activeStreams.get> {
+  return activeStreams.get(key);
+}
+
+export function getStreamKeysBySessionId(sessionId: string): string[] {
+  const keys: string[] = [];
+  for (const [key, entry] of activeStreams.entries()) {
+    if (entry.uiSessionId === sessionId) {
+      keys.push(key);
+    }
+  }
+  return keys;
+}
+
+export function getStreamKeyBySessionAndResponse(
+  sessionId: string,
+  responseId: string,
+): string | undefined {
+  for (const [key, entry] of activeStreams.entries()) {
+    if (
+      entry.uiSessionId === sessionId &&
+      entry.targetResponseId === responseId
+    ) {
+      return key;
+    }
+  }
+  return undefined;
+}
+
+export function removeStream(key: string): void {
+  activeStreams.delete(key);
+  metrics.gauge("streams.active", activeStreams.size);
+}
+
+/**
+ * Mark a stream as having emitted at least one model chunk to the client.
+ * The emit-aware supersede uses this to avoid killing a generation the client
+ * has not consumed yet (e.g. a parallel title request racing the main stream).
+ */
+export function markStreamEmitted(key: string): void {
+  const entry = activeStreams.get(key);
+  if (entry) {
+    entry.emittedChunk = true;
+  }
+}
+
+export function updateStreamTargetResponseId(
+  key: string,
+  targetResponseId: string,
+): void {
+  const entry = activeStreams.get(key);
+  if (entry) {
+    entry.targetResponseId = targetResponseId;
+  }
+}
+
+export function updateStreamSessionId(key: string, uiSessionId: string): void {
+  const entry = activeStreams.get(key);
+  if (entry) {
+    entry.uiSessionId = uiSessionId;
+  }
+}

package/src/core/waf-isolation.ts

@@ -1,117 +1,117 @@
-/**
- * WAF hard-block contingency (aligned with upstream account-isolation.ts).
- *
- * When a Baxia/TMD challenge could NOT be solved, quarantining the account is
- * not enough: the fingerprint seed is derived from the accountId, so the
- * account returns from cooldown on the SAME device identity the WAF already
- * flagged, and the challenge re-propagates immediately. The contingency here:
- *  - escalates the quarantine window per consecutive hard block (×2, capped),
- *  - rotates the account's fingerprint seed (fresh device identity),
- *  - closes the account's Playwright context so the next use re-initializes
- *    with the rotated profile (cookies/storage persist in the profile dir).
- *
- * Strictly per-account: a block on one account never touches another's state.
- */
-import { config } from "./config.ts";
-import { logger } from "./logger.ts";
-import { markAccountRateLimited } from "./account-manager.ts";
-import { rotateFingerprintSeed } from "../services/fingerprint.ts";
-
-const ESCALATION_FACTOR = 2;
-const MAX_CONSECUTIVE_FOR_ESCALATION = 4;
-
-interface WafBlockState {
-  consecutiveHardBlocks: number;
-  lastBlockAt: number;
-}
-
-const states = new Map<string, WafBlockState>();
-
-export interface WafBlockResult {
-  cooldownMs: number;
-  fingerprintRotated: true;
-  escalated: boolean;
-}
-
-type ContextResetListener = (accountId: string) => void | Promise<void>;
-let contextResetListener: ContextResetListener | null = null;
-
-/**
- * Register the hook that physically resets an account's browser context after
- * a fingerprint rotation. Injected by the Playwright layer so this module
- * stays decoupled from it (and unit-testable without a browser).
- */
-export function setWafContextResetListener(fn: ContextResetListener | null): void {
-  contextResetListener = fn;
-}
-
-function getState(accountId: string): WafBlockState {
-  let state = states.get(accountId);
-  if (!state) {
-    state = { consecutiveHardBlocks: 0, lastBlockAt: 0 };
-    states.set(accountId, state);
-  }
-  return state;
-}
-
-export function getWafHardBlockCount(accountId: string): number {
-  return states.get(accountId)?.consecutiveHardBlocks ?? 0;
-}
-
-/**
- * Record an unsolvable WAF challenge on `accountId`: quarantine (escalating),
- * rotate the device fingerprint, and reset the browser context.
- */
-export function recordWafHardBlock(accountId: string): WafBlockResult {
-  const state = getState(accountId);
-  state.consecutiveHardBlocks += 1;
-  state.lastBlockAt = Date.now();
-
-  const base = config.captcha.accountCooldownMs;
-  const cap = config.captcha.hardBlockMaxCooldownMs;
-  const exponent = Math.min(
-    state.consecutiveHardBlocks - 1,
-    MAX_CONSECUTIVE_FOR_ESCALATION,
-  );
-  const cooldownMs = Math.min(cap, base * Math.pow(ESCALATION_FACTOR, exponent));
-
-  if (cooldownMs > 0) {
-    markAccountRateLimited(accountId, cooldownMs, "WafChallenge");
-  }
-
-  rotateFingerprintSeed(accountId);
-  logger.warn(
-    `[WafIsolation] Hard WAF block on ${accountId}: fingerprint rotated (streak ${state.consecutiveHardBlocks}), quarantined ${Math.round(cooldownMs / 1000)}s`,
-  );
-
-  if (contextResetListener) {
-    // Best-effort: the next use re-initializes the context with the rotated
-    // profile; a failed close must not abort the quarantine.
-    void Promise.resolve(contextResetListener(accountId)).catch((error: unknown) => {
-      logger.warn(
-        `[WafIsolation] Context reset listener failed for ${accountId}: ${
-          error instanceof Error ? error.message : String(error)
-        }`,
-      );
-    });
-  }
-
-  return {
-    cooldownMs,
-    fingerprintRotated: true,
-    escalated: state.consecutiveHardBlocks > 1,
-  };
-}
-
-/** A successful stream on the account clears the escalation streak. */
-export function noteWafRecovery(accountId: string): void {
-  const state = states.get(accountId);
-  if (state && state.consecutiveHardBlocks > 0) {
-    state.consecutiveHardBlocks = 0;
-  }
-}
-
-/** Test/admin helper: drop all isolation state for an account. */
-export function clearWafIsolation(accountId: string): void {
-  states.delete(accountId);
-}
+/**
+ * WAF hard-block contingency (aligned with upstream account-isolation.ts).
+ *
+ * When a Baxia/TMD challenge could NOT be solved, quarantining the account is
+ * not enough: the fingerprint seed is derived from the accountId, so the
+ * account returns from cooldown on the SAME device identity the WAF already
+ * flagged, and the challenge re-propagates immediately. The contingency here:
+ *  - escalates the quarantine window per consecutive hard block (×2, capped),
+ *  - rotates the account's fingerprint seed (fresh device identity),
+ *  - closes the account's Playwright context so the next use re-initializes
+ *    with the rotated profile (cookies/storage persist in the profile dir).
+ *
+ * Strictly per-account: a block on one account never touches another's state.
+ */
+import { config } from "./config.ts";
+import { logger } from "./logger.ts";
+import { markAccountRateLimited } from "./account-manager.ts";
+import { rotateFingerprintSeed } from "../services/fingerprint.ts";
+
+const ESCALATION_FACTOR = 2;
+const MAX_CONSECUTIVE_FOR_ESCALATION = 4;
+
+interface WafBlockState {
+  consecutiveHardBlocks: number;
+  lastBlockAt: number;
+}
+
+const states = new Map<string, WafBlockState>();
+
+export interface WafBlockResult {
+  cooldownMs: number;
+  fingerprintRotated: true;
+  escalated: boolean;
+}
+
+type ContextResetListener = (accountId: string) => void | Promise<void>;
+let contextResetListener: ContextResetListener | null = null;
+
+/**
+ * Register the hook that physically resets an account's browser context after
+ * a fingerprint rotation. Injected by the Playwright layer so this module
+ * stays decoupled from it (and unit-testable without a browser).
+ */
+export function setWafContextResetListener(fn: ContextResetListener | null): void {
+  contextResetListener = fn;
+}
+
+function getState(accountId: string): WafBlockState {
+  let state = states.get(accountId);
+  if (!state) {
+    state = { consecutiveHardBlocks: 0, lastBlockAt: 0 };
+    states.set(accountId, state);
+  }
+  return state;
+}
+
+export function getWafHardBlockCount(accountId: string): number {
+  return states.get(accountId)?.consecutiveHardBlocks ?? 0;
+}
+
+/**
+ * Record an unsolvable WAF challenge on `accountId`: quarantine (escalating),
+ * rotate the device fingerprint, and reset the browser context.
+ */
+export function recordWafHardBlock(accountId: string): WafBlockResult {
+  const state = getState(accountId);
+  state.consecutiveHardBlocks += 1;
+  state.lastBlockAt = Date.now();
+
+  const base = config.captcha.accountCooldownMs;
+  const cap = config.captcha.hardBlockMaxCooldownMs;
+  const exponent = Math.min(
+    state.consecutiveHardBlocks - 1,
+    MAX_CONSECUTIVE_FOR_ESCALATION,
+  );
+  const cooldownMs = Math.min(cap, base * Math.pow(ESCALATION_FACTOR, exponent));
+
+  if (cooldownMs > 0) {
+    markAccountRateLimited(accountId, cooldownMs, "WafChallenge");
+  }
+
+  rotateFingerprintSeed(accountId);
+  logger.warn(
+    `[WafIsolation] Hard WAF block on ${accountId}: fingerprint rotated (streak ${state.consecutiveHardBlocks}), quarantined ${Math.round(cooldownMs / 1000)}s`,
+  );
+
+  if (contextResetListener) {
+    // Best-effort: the next use re-initializes the context with the rotated
+    // profile; a failed close must not abort the quarantine.
+    void Promise.resolve(contextResetListener(accountId)).catch((error: unknown) => {
+      logger.warn(
+        `[WafIsolation] Context reset listener failed for ${accountId}: ${
+          error instanceof Error ? error.message : String(error)
+        }`,
+      );
+    });
+  }
+
+  return {
+    cooldownMs,
+    fingerprintRotated: true,
+    escalated: state.consecutiveHardBlocks > 1,
+  };
+}
+
+/** A successful stream on the account clears the escalation streak. */
+export function noteWafRecovery(accountId: string): void {
+  const state = states.get(accountId);
+  if (state && state.consecutiveHardBlocks > 0) {
+    state.consecutiveHardBlocks = 0;
+  }
+}
+
+/** Test/admin helper: drop all isolation state for an account. */
+export function clearWafIsolation(accountId: string): void {
+  states.delete(accountId);
+}