@cnbcool/cnb-api-generate 2.4.2 → 2.4.3

package/client/core.ts

@@ -4,6 +4,7 @@ import os from 'os';
 import { fetchResponseHandler } from "./fetch-response-handler";
 import { generateUniqueId } from './utils/generate-unique-id';
 import { resolveToken } from './utils/resolve-token';
+import { resolveApiDomain } from './utils/resolve-api-domain';
 
 /**
  * 格式化 API 响应
@@ -118,7 +119,7 @@ async function formatResponse(data: any, response: any) {
 
 async function clientFetch(data: any): Promise<any> {
   const token = await resolveToken();
-  const domain = process.env.CNB_API_ENDPOINT || 'https://api.cnb.cool'
+  const domain = resolveApiDomain()
   const url = `${domain}${data.url}`
   const urlParse = new URL(url);
   if (data.params) {

package/client/lib/build-helpers.ts

@@ -7,6 +7,7 @@
  */
 
 import { resolveToken } from '../utils/resolve-token';
+import { resolveApiDomain } from '../utils/resolve-api-domain';
 
 /** CNB 构建号格式：cnb-xxx-xxxxxxxxx（字母/数字组成的两段） */
 export const SN_PATTERN = /^cnb-[a-z0-9]+-[a-z0-9]+$/i;
@@ -111,7 +112,7 @@ export async function resolveBuildContext(
   | { ok: true; ctx: ResolvedContext }
   | { ok: false; message: string }
 > {
-  const domain = process.env.CNB_API_ENDPOINT || 'https://api.cnb.cool';
+  const domain = resolveApiDomain();
   const { repo } = options;
   let sn = options.sn;
 

package/client/lib/login.ts

@@ -78,11 +78,15 @@ export function registerLoginCommand(program: Command): void {
         }
         // 持久化 token
         const nowSec = Math.floor(Date.now() / 1000);
+        // 从 platformURL 推导 API 域名，例如 https://cnb.cool -> https://api.cnb.cool
+        const platformHost = new URL(cfg.platformURL).hostname;
+        const loginHost = `https://api.${platformHost}`;
         const store: TokenStore = {
           access_token: tok.access_token,
           expires_at: nowSec + tok.expires_in,
           platform_url: cfg.platformURL,
           client_id: cfg.clientID,
+          login_host: loginHost,
         };
         if (tok.refresh_token) {
           store.refresh_token = tok.refresh_token;

package/client/utils/resolve-api-domain.ts

@@ -0,0 +1,26 @@
+import { loadToken } from './load-token';
+
+/**
+ * 获取 API 域名。
+ *
+ * 优先级：
+ * 1. 如果设置了环境变量 CNB_TOKEN（即非 OAuth 登录），使用 CNB_API_ENDPOINT 或默认值
+ * 2. 如果是 OAuth 登录（token 文件中有 login_host），使用登录时记录的域名
+ * 3. 兜底使用 CNB_API_ENDPOINT 或默认值 https://api.cnb.cool
+ */
+export function resolveApiDomain(): string {
+  const defaultDomain = process.env.CNB_API_ENDPOINT || 'https://api.cnb.cool';
+
+  // 如果使用环境变量 token，直接走 CNB_API_ENDPOINT
+  if (process.env.CNB_TOKEN_FOR_CODEBUDDY || process.env.CNB_TOKEN) {
+    return defaultDomain;
+  }
+
+  // OAuth 登录场景：优先使用登录时记录的域名
+  const store = loadToken();
+  if (store?.login_host) {
+    return store.login_host;
+  }
+
+  return defaultDomain;
+}

package/client/utils/types.ts

@@ -42,4 +42,6 @@ export interface TokenStore {
   platform_url?: string;
   /** 用于 refresh 时携带 client_id */
   client_id?: string;
+  /** 登录时使用的 API 域名（如 https://api.cnb.cool），用于后续 CLI 调用 */
+  login_host?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnbcool/cnb-api-generate",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "main": "./built/index.js",
   "module": "./src/index.ts",
   "types": "./src/index.ts",