@2api-store/activate 0.3.6 → 0.3.7

package/activate.mjs

@@ -18,7 +18,7 @@ process.env.NODE_NO_WARNINGS = '1'
  */
 
 import { detectAll } from './lib/detect.mjs'
-import { cliActivate, verifyApiKey } from './lib/api.mjs'
+import { cliActivate, listGroups, verifyApiKey } from './lib/api.mjs'
 import { renderContent, expandPath, listModels } from './lib/render.mjs'
 import { backupFile } from './lib/backup.mjs'
 import { writeFileWithPermission, PermissionDeniedError } from './lib/write.mjs'
@@ -186,21 +186,40 @@ async function main() {
   }
   info(`识别为：${kind === 'key' ? 'API Key' : '兑换码'}模式`)
 
-  // === 3. 兑换码 → 邮箱 ===
+  // === 3. 兑换码 → 邮箱 + 选组 ===
   let email = ''
+  let groupId = null
   if (kind === 'redeem') {
     email = (await ask('请输入邮箱（用于兑换码绑定 / 新账号创建）')).trim()
     if (!email || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
       fail('邮箱格式不正确')
       return 1
     }
+
+    // 选组：兑换码模式都走选组流程（balance 类型码用 group_id 绑定 + 加余额 + 建 key；
+    // api_key 类型码若码已绑组则后端忽略传入的 group_id，但 CLI 选组无害，统一流程）
+    step('获取可用分组')
+    const groups = await listGroups({ apiBase })
+    if (groups.length === 0) {
+      fail('未查询到可用分组。请联系管理员开通分组后再激活。')
+      return 1
+    }
+    const groupItems = groups.map((g) => ({ label: `${g.name}`, value: g.id }))
+    const groupIdx = await select('选择绑定的分组', groupItems, { defaultIndex: 0 })
+    groupId = groups[groupIdx]?.id
+    if (!groupId) {
+      fail('未选择分组')
+      return 1
+    }
+    ok(`已选分组：${groups[groupIdx].name}（ID ${groupId}）`)
+    console.log()
   }
 
   // === 4. POST /cli/activate ===
   step('请求激活服务')
   let bundle
   try {
-    bundle = await cliActivate({ credential, email, platform: args.platform, apiBase })
+    bundle = await cliActivate({ credential, email, platform: args.platform, groupId, apiBase })
   } catch (err) {
     fail(`激活失败：${err.message}`)
     if (err.statusCode) fail(`  HTTP ${err.statusCode}`)

package/lib/api.mjs

@@ -6,10 +6,10 @@ const DEFAULT_TIMEOUT_MS = 30000
 
 /**
  * 发送 POST /api/v1/cli/activate 请求
- * @param {{credential: string, email?: string, platform?: string, apiBase: string}} opts
+ * @param {{credential: string, email?: string, platform?: string, group_id?: number, apiBase: string}} opts
  * @returns {Promise<object>} 解析后的 JSON 响应
  */
-export function cliActivate({ credential, email, platform, apiBase }) {
+export function cliActivate({ credential, email, platform, groupId, apiBase }) {
   return new Promise((resolve, reject) => {
     let url
     try {
@@ -24,6 +24,7 @@ export function cliActivate({ credential, email, platform, apiBase }) {
       credential,
       ...(email ? { email } : {}),
       ...(platform ? { platform } : {}),
+      ...(groupId ? { group_id: groupId } : {}),
     }
     const body = JSON.stringify(payload)
 
@@ -76,6 +77,69 @@ export function cliActivate({ credential, email, platform, apiBase }) {
   })
 }
 
+/**
+ * 获取可用分组列表：GET /api/v1/cli/groups
+ * 兑换码模式（balance 类型码无 group_id）CLI 选组用。
+ * @param {{apiBase: string}} opts
+ * @returns {Promise<Array<{id: number, name: string}>>} 分组列表（精简，仅 id+name）
+ */
+export function listGroups({ apiBase }) {
+  return new Promise((resolve, reject) => {
+    let url
+    try {
+      url = new URL('/api/v1/cli/groups', apiBase)
+    } catch (err) {
+      reject(new Error(`无效的 apiBase：${apiBase}（${err.message}）`))
+      return
+    }
+
+    const lib = url.protocol === 'https:' ? https : http
+    const req = lib.request(
+      url,
+      {
+        method: 'GET',
+        headers: {
+          'User-Agent': USER_AGENT,
+          Accept: 'application/json',
+        },
+        timeout: DEFAULT_TIMEOUT_MS,
+      },
+      (res) => {
+        const chunks = []
+        res.on('data', (c) => chunks.push(c))
+        res.on('end', () => {
+          const text = Buffer.concat(chunks).toString('utf8')
+          let json
+          try {
+            json = text ? JSON.parse(text) : {}
+          } catch {
+            // 响应非 JSON，退化为空列表（CLI 兜底）
+            resolve([])
+            return
+          }
+          if (res.statusCode >= 200 && res.statusCode < 300) {
+            // 后端返回 {groups: [{id,name}]}；兼容直接返回数组的形式
+            const arr = Array.isArray(json) ? json : json?.groups
+            resolve(Array.isArray(arr) ? arr : [])
+          } else {
+            // 失败退化：返回空列表（不阻塞激活主流程，让用户看到「无组可选」提示）
+            resolve([])
+          }
+        })
+      },
+    )
+
+    req.on('timeout', () => {
+      req.destroy(new Error(`请求超时（${DEFAULT_TIMEOUT_MS / 1000}s）— ${url.href}`))
+    })
+    req.on('error', (err) => {
+      // 网络错误同样退化为空列表（CLI 兜底）
+      resolve([])
+    })
+    req.end()
+  })
+}
+
 /**
  * 验证 API Key：GET {baseUrl}/v1/models（Bearer api_key），期望 200
  * @param {{apiKey: string, baseUrl: string}} opts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2api-store/activate",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "TokenShop CLI 一键激活：配置本地 codex/claude/gemini/grok/opencode 指向 2api.store 中转（彩色输出 + 自动安装 CLI）",
   "type": "module",
   "bin": {