@hung319/opencode-qwen 1.1.4 → 1.1.6

package/README.md

@@ -26,7 +26,7 @@ Or add to your `opencode.json` with specific version:
 
 ```json
 {
-  "plugin": ["@hung319/opencode-qwen@1.1.3"]
+  "plugin": ["@hung319/opencode-qwen@1.1.5"]
 }
 ```
 

package/dist/plugin.js

@@ -395,8 +395,11 @@ export const createQwenPlugin = (id) => async ({ client, directory }) => {
                                     break;
                                 }
                                 try {
-                                    const validation = await validateToken(token);
-                                    const email = await promptEmail();
+                                    // Add timeout to prevent hanging during validation
+                                    const validationPromise = validateToken(token);
+                                    const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error('Token validation timed out')), 15000));
+                                    const validation = await Promise.race([validationPromise, timeoutPromise]);
+                                    const email = validation.email || await promptEmail();
                                     accounts.push({ apiKey: token, email });
                                     const isFirstAccount = accounts.length === 1;
                                     const am = await AccountManager.loadFromDisk(config.account_selection_strategy);
@@ -437,7 +440,12 @@ export const createQwenPlugin = (id) => async ({ client, directory }) => {
                                             callback: async () => ({ type: 'failed' })
                                         });
                                     }
-                                    break;
+                                    // Allow user to try another token instead of breaking completely
+                                    const addAnother = await promptAddAnotherAccount(accounts.length);
+                                    if (!addAnother) {
+                                        break;
+                                    }
+                                    continue; // Continue to ask for another token
                                 }
                             }
                             const primary = accounts[0];

package/dist/qwen/token.js

@@ -3,34 +3,20 @@ export async function validateToken(apiKey) {
     // First validate using header-based auth
     // Use a minimal fetch that only checks if the token is valid
     try {
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), 10000); // 10 second timeout
-        const response = await fetch(`${QWEN_CONSTANTS.BASE_URL}/models`, {
+        // Only try the validation endpoint first to get user info, as it's more efficient
+        const validateController = new AbortController();
+        const validateTimeoutId = setTimeout(() => validateController.abort(), 10000); // 10 second timeout
+        const validateResponse = await fetch(QWEN_CONSTANTS.VALIDATE_URL, {
+            method: 'POST',
             headers: {
-                Authorization: `Bearer ${apiKey}`,
+                'Content-Type': 'application/json',
                 'User-Agent': QWEN_CONSTANTS.USER_AGENT
             },
-            signal: controller.signal
+            body: JSON.stringify({ token: apiKey }),
+            signal: validateController.signal
         });
-        clearTimeout(timeoutId);
-        if (!response.ok) {
-            // Try validation endpoint with token in request body as fallback
-            const validateController = new AbortController();
-            const validateTimeoutId = setTimeout(() => validateController.abort(), 10000); // 10 second timeout
-            const validateResponse = await fetch(QWEN_CONSTANTS.VALIDATE_URL, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'User-Agent': QWEN_CONSTANTS.USER_AGENT
-                },
-                body: JSON.stringify({ token: apiKey }),
-                signal: validateController.signal
-            });
-            clearTimeout(validateTimeoutId);
-            if (!validateResponse.ok) {
-                const errorText = await validateResponse.text().catch(() => '');
-                throw new Error(`Token validation failed: ${validateResponse.status} - ${errorText}`);
-            }
+        clearTimeout(validateTimeoutId);
+        if (validateResponse.ok) {
             // Extract email from the validation response
             const validationData = await validateResponse.json();
             const email = validationData.email || 'qwen-token-user';
@@ -41,35 +27,27 @@ export async function validateToken(apiKey) {
             };
         }
         else {
-            // If the models endpoint worked, try to get user info from validation endpoint anyway
-            const validateController = new AbortController();
-            const validateTimeoutId = setTimeout(() => validateController.abort(), 10000); // 10 second timeout
-            const validateResponse = await fetch(QWEN_CONSTANTS.VALIDATE_URL, {
-                method: 'POST',
+            // If validation endpoint failed, try models endpoint as fallback
+            const modelsController = new AbortController();
+            const modelsTimeoutId = setTimeout(() => modelsController.abort(), 10000); // 10 second timeout
+            const modelsResponse = await fetch(`${QWEN_CONSTANTS.BASE_URL}/models`, {
                 headers: {
-                    'Content-Type': 'application/json',
+                    Authorization: `Bearer ${apiKey}`,
                     'User-Agent': QWEN_CONSTANTS.USER_AGENT
                 },
-                body: JSON.stringify({ token: apiKey }),
-                signal: validateController.signal
+                signal: modelsController.signal
             });
-            clearTimeout(validateTimeoutId);
-            if (validateResponse.ok) {
-                // Extract email from the validation response
-                const validationData = await validateResponse.json();
-                const email = validationData.email || 'qwen-token-user';
+            clearTimeout(modelsTimeoutId);
+            if (modelsResponse.ok) {
                 return {
                     apiKey,
-                    email,
+                    email: 'qwen-token-user', // Fallback to default email if models endpoint was used
                     authMethod: 'token'
                 };
             }
             else {
-                return {
-                    apiKey,
-                    email: 'qwen-token-user',
-                    authMethod: 'token'
-                };
+                const errorText = await modelsResponse.text().catch(() => '');
+                throw new Error(`Token validation failed: ${modelsResponse.status} - ${errorText}`);
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hung319/opencode-qwen",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "OpenCode plugin for Qwen API providing access to Qwen AI models with auto-config and token management",
   "type": "module",
   "main": "dist/index.js",