qwenproxy-cli 1.2.10 → 1.3.1

package/src/routes/upload.ts

@@ -341,21 +341,22 @@ async function getSTSToken(
   filesize: number,
   filetype: string,
   headers: Record<string, string>,
+  accountId?: string,
 ): Promise<STSResponse["data"]> {
-  const response = await fetch(
-    qwenUrl("/api/v2/files/getstsToken"),
-    {
+  const doFetch = (reqHeaders: Record<string, string>) =>
+    fetch(qwenUrl("/api/v2/files/getstsToken"), {
       method: "POST",
       headers: buildQwenRequestHeaders({
-        cookie: headers.cookie,
-        userAgent: headers["user-agent"],
-        bxUa: headers["bx-ua"],
-        bxUmidtoken: headers["bx-umidtoken"],
-        bxV: headers["bx-v"],
+        cookie: reqHeaders.cookie,
+        userAgent: reqHeaders["user-agent"],
+        bxUa: reqHeaders["bx-ua"],
+        bxUmidtoken: reqHeaders["bx-umidtoken"],
+        bxV: reqHeaders["bx-v"],
       }),
       body: JSON.stringify({ filename, filesize: String(filesize), filetype }),
-    },
-  );
+    });
+
+  let response = await doFetch(headers);
 
   if (!response.ok) {
     const errorText = await response.text().catch(() => "");
@@ -364,8 +365,43 @@ async function getSTSToken(
     );
   }
 
-  const data = await response.json();
-  if (!data.success || !data.data) {
+  let data = await response.json().catch(() => null);
+  const is401 =
+    data?.success === false &&
+    (data?.data?.code === "Unauthorized" ||
+      (typeof data?.data?.details === "string" &&
+        data.data.details.includes("401")));
+
+  if (is401) {
+    try {
+      const { refreshHeaders } = await import("../services/playwright.ts");
+      const { getBasicHeaders } = await import("../services/auth-playwright.ts");
+      const { loadAccounts } = await import("../core/accounts.ts");
+      const resolvedId = accountId ?? loadAccounts()[0]?.id;
+      if (resolvedId) {
+        console.warn(
+          `[Upload] STS token 401 — refreshing session with re-auth and retrying...`,
+        );
+        await refreshHeaders(resolvedId, undefined, true);
+        const fresh = await getBasicHeaders(resolvedId);
+        headers.cookie = fresh.cookie;
+        headers["user-agent"] = fresh.userAgent;
+        headers["bx-v"] = fresh.bxV;
+        if (fresh.bxUa) headers["bx-ua"] = fresh.bxUa;
+        if (fresh.bxUmidtoken) headers["bx-umidtoken"] = fresh.bxUmidtoken;
+        response = await doFetch(headers);
+        if (response.ok) {
+          data = await response.json().catch(() => null);
+        }
+      }
+    } catch (refreshErr) {
+      console.warn(
+        `[Upload] Re-auth for STS token failed: ${refreshErr instanceof Error ? refreshErr.message : String(refreshErr)}`,
+      );
+    }
+  }
+
+  if (!data?.success || !data?.data) {
     throw new Error(
       `STS token invalid: ${JSON.stringify(data).substring(0, 200)}`,
     );
@@ -617,6 +653,7 @@ export async function processImagesForQwen(
     file_url?: { url: string };
   }>,
   headers: Record<string, string>,
+  accountId?: string,
 ): Promise<{ text: string; files: QwenFileEntry[] }> {
   const textParts: string[] = [];
   const files: QwenFileEntry[] = [];
@@ -654,6 +691,7 @@ export async function processImagesForQwen(
             fileSize,
             typeInfo.qwenFileType,
             headers,
+            accountId,
           );
           fileUrl = await uploadToOSS(remoteMedia.buffer, stsData, filename);
           fileId = stsData.file_id;
@@ -686,6 +724,7 @@ export async function processImagesForQwen(
             fileSize,
             typeInfo.qwenFileType,
             headers,
+            accountId,
           );
           fileUrl = await uploadToOSS(buffer, stsData, filename);
           fileId = stsData.file_id;

package/src/services/auth-playwright.ts

@@ -94,36 +94,13 @@ export async function getBasicHeaders(accountId?: string): Promise<{
   return getPlaywrightBasicHeaders(resolvedAccountId);
 }
 
-export function isTokenExpiringSoon(
-  cookie: string,
-  minutesBeforeExpiry = 5,
-): boolean {
-  const tokenMatch = cookie.match(/token=([^;]+)/);
-  if (!tokenMatch) return false;
-
-  try {
-    const token = decodeURIComponent(tokenMatch[1]);
-    const segments = token.split(".");
-    // Some Qwen deployments use opaque cookies. Treating those as expired
-    // forces expensive header capture on every personalization request.
-    if (segments.length !== 3 || !segments[1]) return false;
-
-    const payloadJson = Buffer.from(segments[1], "base64url").toString("utf-8");
-    const payload = JSON.parse(payloadJson);
-    const exp = payload.exp;
-    if (typeof exp !== "number" || !Number.isFinite(exp)) return false;
-
-    const nowSec = Math.floor(Date.now() / 1000);
-    const thresholdSec = minutesBeforeExpiry * 60;
-    return exp - nowSec < thresholdSec;
-  } catch {
-    return false;
-  }
-}
+import { parseJwtExpiry, isTokenExpiringSoon } from "../utils/jwt.ts";
+export { parseJwtExpiry, isTokenExpiringSoon };
 
 export async function getQwenHeaders(
   forceNew = false,
   accountId?: string,
+  forceReauth = false,
 ): Promise<HeaderResult> {
   if (isAuthMockEnabled()) {
     const basic = await getBasicHeaders(accountId);
@@ -150,8 +127,8 @@ export async function getQwenHeaders(
 
   await ensurePlaywrightInitialized(resolvedAccountId);
 
-  if (forceNew) {
-    await refreshHeaders(resolvedAccountId);
+  if (forceNew || forceReauth) {
+    await refreshHeaders(resolvedAccountId, config.timeouts.headers, forceReauth);
   }
 
   const basic = await getPlaywrightBasicHeaders(resolvedAccountId);