@kevisual/cnb 0.0.37 → 0.0.40

package/agent/app.ts

@@ -1,17 +1,35 @@
 import { QueryRouterServer as App } from '@kevisual/router'
 import { useContextKey } from '@kevisual/context'
-import { useConfig, useKey } from '@kevisual/use-config'
+import { useKey } from '@kevisual/use-config'
 import { CNB } from '../src/index.ts';
+import { CNBManager } from './modules/cnb-manager.ts'
+export const cnbManager = new CNBManager()
 
-export const config = useConfig()
-export const cnb = useContextKey<CNB>('cnb', () => {
-  // CNB_TOKEN是降级兼容变量，推荐使用CNB_API_KEY
-  // CNB_TOKEN 是流水线自己就有的变量，但是权限比较小
-  const token = useKey('CNB_API_KEY') as string || useKey('CNB_TOKEN') as string
-  // cookie 变量是可选的
-  const cookie = useKey('CNB_COOKIE') as string
-  return new CNB({ token: token, cookie: cookie });
-})
-export const app = useContextKey<App>('app', () => {
+// CNB_TOKEN是降级兼容变量，推荐使用CNB_API_KEY
+// CNB_TOKEN 是流水线自己就有的变量，但是权限比较小
+const token = useKey('CNB_API_KEY') as string || useKey('CNB_TOKEN') as string
+// cookie 变量是可选的
+const cookie = useKey('CNB_COOKIE') as string
+try {
+  cnbManager.addCNB({
+    username: 'default',
+    token: token,
+    cookie: cookie,
+    cnb: new CNB({ token: token, cookie: cookie })
+  })
+} catch (error) {
+
+}
+export const cnb = (await cnbManager.getCNB({ username: 'default' })).cnb
+export const app = await useContextKey<App>('app', () => {
   return new App({})
-})
+})
+
+export const notCNBCheck = (ctx: any) => {
+  const isCNB = useKey('CNB');
+  if (!isCNB) {
+    ctx.throw(400, '当前环境非 cnb-board 环境，无法获取 live 内容');
+    return true;
+  }
+  return false;
+}

package/agent/main.ts

@@ -0,0 +1,18 @@
+// import { RemoteApp } from '@kevisual/remote-app';
+import { app } from './index.ts'
+// import { QueryLoginNode } from '@kevisual/api/login-node';
+// const queryLoginNode = new QueryLoginNode({});
+// await queryLoginNode.init()
+// const token = await queryLoginNode.getToken();
+// app.createRouteList()
+// const remoteApp = new RemoteApp({
+//   id: 'cnb-agent',
+//   token: token,
+//   url: 'https://kevisual.cn/ws/proxy',
+//   app: app as any,
+// })
+// const isConnected = await remoteApp.isConnect();
+// if (isConnected) {
+//   console.log('Remote app connected successfully');
+//   remoteApp.listenProxy();
+// }

package/agent/modules/cnb-manager.ts

@@ -0,0 +1,119 @@
+import { Result } from '@kevisual/query';
+import { CNB } from '../../src/index.ts';
+import { useKey } from '@kevisual/context';
+export const getConfig = async (opts: { token?: string }) => {
+  const kevisualEnv = useKey('KEVISUAL_ENV')
+  const baseUrl = kevisualEnv === 'production' ? 'https://kevisual.cn/api/router' : 'https://kevisual.xiongxiao.me/api/router';
+  const res = await fetch(baseUrl, {
+    method: 'POST',
+    body: JSON.stringify({
+      path: 'config',
+      key: 'get',
+      data: {
+        key: "cnb_center_config.json"
+      }
+    }),
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': `Bearer ${opts.token!}`
+    },
+  }).then(res => res.json());
+  return res as Result<{
+    id: string, key: 'cnb_center_config.json', data: {
+      CNB_API_KEY: string,
+      CNB_COOKIE: string
+    }
+  }>;
+}
+type CNBItem = {
+  username: string,
+  token: string,
+  cookie?: string
+  runAt?: number
+  owner?: boolean
+  cnb: CNB
+}
+export class CNBManager {
+  cnbMap: Map<string, CNBItem> = new Map()
+  constructor() {
+    setInterval(() => {
+      this.clearExpiredCNB()
+    }, 1000 * 60 * 30) // 每30分钟清理一次过期的 CNB 实例
+  }
+  getDefaultCNB() {
+    const cnbItem = this.cnbMap.get('default')
+    if (!cnbItem) {
+      throw new Error('Default CNB not found')
+    }
+    return cnbItem
+  }
+  async getCNB(opts?: { username?: string, kevisualToken?: string }): Promise<CNBItem | null> {
+    const username = opts?.username
+    const cnbItem = this.cnbMap.get(username)
+    if (cnbItem) {
+      cnbItem.runAt = Date.now()
+      return cnbItem
+    }
+
+    const res = await getConfig({ token: opts?.kevisualToken })
+    if (res.code === 200) {
+      const cookie = res.data?.data?.CNB_COOKIE
+      const token = res.data?.data?.CNB_API_KEY
+      if (token) {
+        return this.addCNB({ username, token, cookie })
+      }
+    }
+    return null
+  }
+  /**
+   * 通过上下文获取 CNB 实例（直接返回 cnb 对象）
+   * @param ctx
+   * @returns CNB 实例
+   */
+  async getContext(ctx: any) {
+    const tokenUser = ctx?.state?.tokenUser
+    const username = tokenUser?.username
+    if (!username) {
+      ctx.throw(403, 'Unauthorized')
+    }
+    if (username === 'default') {
+      return this.getDefaultCNB().cnb
+    }
+    const kevisualToken = ctx.query?.token;
+    const item = await this.getCNB({ username, kevisualToken });
+    if (!item) {
+      ctx.throw(400, '不存在的 CNB 配置项，请检查 登录 Token 是否正确，或添加 CNB 配置')
+    }
+    return item.cnb
+  }
+  addCNB(opts: Partial<CNBItem>) {
+    if (!opts.username || !opts.token) {
+      throw new Error('username and token are required')
+    }
+    const exist = this.cnbMap.get(opts.username)
+    if (exist) {
+      exist.runAt = Date.now()
+      return exist
+    }
+    const cnb = opts?.cnb || new CNB({ token: opts.token, cookie: opts.cookie });
+    opts.cnb = cnb;
+    opts.runAt = Date.now()
+    this.cnbMap.set(opts.username, opts as CNBItem)
+    return opts as CNBItem
+  }
+  // 定期清理过期的 CNB 实例，默认过期时间为 1 小时
+  clearExpiredCNB(expireTime = 1000 * 60 * 60) {
+    const now = Date.now()
+    for (const [username, item] of this.cnbMap.entries()) {
+      if (username === 'default') {
+        continue
+      }
+      if (item.runAt && now - item.runAt > expireTime) {
+        this.cnbMap.delete(username)
+      }
+    }
+  }
+  clearUsername(username: string) {
+    this.cnbMap.delete(username)
+  }
+}

package/agent/opencode.ts

@@ -2,5 +2,5 @@ import { app } from './index.ts';
 import { createRouterAgentPluginFn } from '@kevisual/router/opencode'
 
 export const CnbPlugin = createRouterAgentPluginFn({
-  router: app,
+  router: app as any,
 })

package/agent/routes/cnb-board/cnb-dev-env.ts

@@ -1,23 +1,13 @@
-import { app } from '../../app.ts';
+import { app, notCNBCheck } from '../../app.ts';
 import { useKey } from '@kevisual/context'
 import { getLiveMdContent } from './live/live-content.ts';
 import z from 'zod';
-const notCNBCheck = (ctx: any) => {
-  const isCNB = useKey('CNB');
-  if (!isCNB) {
-    ctx.body = {
-      title: '非 cnb-board 环境',
-      list: []
-    }
-    return true;
-  }
-  return false;
-}
+
 app.route({
   path: 'cnb_board',
   key: 'live',
   description: '获取cnb-board live的mdContent内容',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
   metadata: {
     args: {
       more: z.boolean().optional().describe('是否获取更多系统信息，默认false'),
@@ -37,7 +27,7 @@ app.route({
   path: 'cnb_board',
   key: 'live_repo_info',
   description: '获取cnb-board live的repo信息',
-  middleware: ['auth-admin']
+  middleware: ['auth']
 }).define(async (ctx) => {
   const repoSlug = useKey('CNB_REPO_SLUG') || '';
   const repoName = useKey('CNB_REPO_NAME') || '';
@@ -90,7 +80,7 @@ app.route({
   path: 'cnb_board',
   key: 'live_build_info',
   description: '获取cnb-board live的构建信息',
-  middleware: ['auth-admin']
+  middleware: ['auth']
 }).define(async (ctx) => {
   if (notCNBCheck(ctx)) return;
   const labels = [

package/agent/routes/cnb-board/index.ts

@@ -1,4 +1,4 @@
-import { app } from '../../app.ts';
+import { app, notCNBCheck } from '../../app.ts';
 import './cnb-dev-env.ts';
 import { useKey } from '@kevisual/context';
 import { spawnSync } from 'node:child_process';
@@ -31,8 +31,9 @@ app.route({
   path: 'cnb_board',
   key: 'exit',
   description: 'cnb的工作环境退出程序',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
 }).define(async (ctx) => {
+  if (notCNBCheck(ctx)) return;
   const cmd = 'kill 1';
   execCommand(cmd);
 }).addTo(app);

package/agent/routes/cnb-env/check.ts

@@ -1,5 +1,5 @@
 import { createSkill } from '@kevisual/router';
-import { app, cnb } from '../../app.ts';
+import { app, cnbManager } from '../../app.ts';
 import { tool } from '@opencode-ai/plugin/tool';
 
 
@@ -7,7 +7,7 @@ app.route({
   path: 'cnb',
   key: 'user-check',
   description: '检查用户登录状态，参数checkToken,default true; checkCookie, default false',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -24,6 +24,7 @@ app.route({
   const checkToken = ctx.query?.checkToken ?? true;
   const checkCookie = ctx.query?.checkCookie ?? false;
   let content = '';
+  const cnb = await cnbManager.getContext(ctx);
   if (checkToken) {
     const res = await cnb.user.getUser();
     if (res?.code !== 200) {

package/agent/routes/cnb-env/env.ts

@@ -1,12 +1,12 @@
 import { createSkill, tool } from '@kevisual/router';
-import { app, cnb } from '../../app.ts';
+import { app, cnbManager } from '../../app.ts';
 
 // 设置 CNB_COOKIE环境变量和获取环境变量,用于界面操作定制模块功能
 app.route({
   path: 'cnb',
   key: 'set-cnb-cookie',
   description: '设置当前cnb工作空间的cookie环境变量',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -19,6 +19,7 @@ app.route({
     })
   }
 }).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
   const cookie = ctx.query?.cookie;
   if (!cookie) {
     ctx.body = { content: '请提供有效的cookie值' };
@@ -33,7 +34,7 @@ app.route({
   path: 'cnb',
   key: 'get-cnb-cookie',
   description: '获取当前cnb工作空间的cookie环境变量',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -43,6 +44,7 @@ app.route({
     })
   }
 }).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
   const cookie = cnb.cookie || '未设置cookie环境变量';
   ctx.body = { content: `当前cnb工作空间的cookie环境变量为：${cookie}` };
 }).addTo(app);

package/agent/routes/cnb-env/vscode.ts

@@ -1,5 +1,5 @@
 import { createSkill, tool } from '@kevisual/router';
-import { app, cnb } from '../../app.ts';
+import { app, notCNBCheck } from '../../app.ts';
 
 import { CNB_ENV } from "@/common/cnb-env.ts";
 
@@ -11,7 +11,7 @@ app.route({
   path: 'cnb',
   key: 'get-cnb-port-uri',
   description: '获取当前cnb工作空间的port代理uri',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -24,6 +24,7 @@ app.route({
     })
   }
 }).define(async (ctx) => {
+  if (notCNBCheck(ctx)) return;
   const port = ctx.query?.port || 51515;
   const uri = CNB_ENV?.CNB_VSCODE_PROXY_URI as string || '';
   const finalUri = uri.replace('{{port}}', port.toString());
@@ -40,7 +41,7 @@ app.route({
   path: 'cnb',
   key: 'get-cnb-vscode-uri',
   description: '获取当前cnb工作空间的vscode代理uri, 包括多种访问方式, 如web、vscode、codebuddy、cursor、ssh',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -58,6 +59,7 @@ app.route({
     })
   }
 }).define(async (ctx) => {
+  if (notCNBCheck(ctx)) return;
   const web = ctx.query?.web ?? false;
   const vscode = ctx.query?.vscode ?? true; // 默认true
   const codebuddy = ctx.query?.codebuddy ?? false;

package/agent/routes/cnb-manager/index.ts

@@ -0,0 +1,48 @@
+import { app, cnbManager } from '../../app.ts';
+
+// "列出我的代码仓库，search blog"
+// 列出我的知识库的代码仓库
+app.route({
+  path: 'cnb',
+  key: 'clear-me-manager',
+  description: '清理我的cnb-manager记录',
+  middleware: ['auth'],
+
+}).define(async (ctx) => {
+  const tokenUser = ctx.tokenUser;
+  if (!tokenUser) {
+    ctx.throw(401, '未授权');
+  }
+  const username = tokenUser.username;
+  if (!username) {
+    ctx.throw(400, '无效的用户信息');
+  }
+  if (username !== 'default') {
+    cnbManager.clearUsername(username);
+  }
+  ctx.body = { content: '已清理cnb-manager记录' };
+}).addTo(app);
+
+app.route({
+  path: 'cnb',
+  key: 'get-my-config',
+  description: '获取我的cnb配置',
+  middleware: ['auth'],
+}).define(async (ctx) => {
+  const username = ctx.tokenUser?.username;
+  const token = ctx.query?.token;
+  if (!username) {
+    ctx.throw(400, '未授权');
+  }
+  if (!token) {
+    ctx.throw(400, '缺少token参数');
+  }
+  const cnbItem = await cnbManager.getCNB({ username, kevisualToken: token });
+  if (!cnbItem) {
+    ctx.throw(404, '未找到cnb-manager记录');
+  }
+  ctx.body = {
+    token: cnbItem.token,
+    cookie: cnbItem.cookie,
+  }
+}).addTo(app);

package/agent/routes/index.ts

@@ -8,6 +8,8 @@ import './knowledge/index.ts'
 import './issues/index.ts'
 import './cnb-board/index.ts';
 import './share/index.ts';
+import './cnb-manager/index.ts';
+
 /**
  * 验证上下文中的 App ID 是否与指定的 App ID 匹配
  * @param {any} ctx - 上下文对象，可能包含 appId 属性
@@ -32,6 +34,9 @@ app.route({
 }).define(async (ctx) => {
   // ctx.body = 'Auth Route';
   if (checkAppId(ctx, app.appId)) {
+    ctx.state.tokenUser = {
+      username: 'default',
+    }
     return;
   }
 }).addTo(app, { overwrite: false });
@@ -43,6 +48,9 @@ app.route({
 }).define(async (ctx) => {
   // ctx.body = 'Admin Auth Route';
   if (checkAppId(ctx, app.appId)) {
+    ctx.state.tokenUser = {
+      username: 'default',
+    }
     return;
   }
 }).addTo(app, { overwrite: false });

package/agent/routes/issues/issue.ts

@@ -1,5 +1,5 @@
 import { createSkill, tool } from '@kevisual/router';
-import { app, cnb } from '../../app.ts';
+import { app, cnbManager } from '../../app.ts';
 import { IssueItem } from '@/index.ts';
 
 // 创建cnb issue, 仓库为 kevisual/kevisual 标题为 "自动化测试创建issue", 内容为 "这是通过API创建的issue，用于测试目的", body: "这是通过API创建的issue，用于测试目的"
@@ -7,7 +7,7 @@ app.route({
   path: 'cnb',
   key: 'create-issue',
   description: '创建 Issue, 参数 repo, title, body, assignees, labels, priority',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -25,6 +25,7 @@ app.route({
     })
   }
 }).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
   const repo = ctx.query?.repo;
   const title = ctx.query?.title;
   const body = ctx.query?.body;
@@ -51,7 +52,7 @@ app.route({
   path: 'cnb',
   key: 'complete-issue',
   description: '完成 Issue, 参数 repo, issueNumber',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -66,6 +67,7 @@ app.route({
     })
   }
 }).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
   const repo = ctx.query?.repo;
   const issueNumber = ctx.query?.issueNumber;
   const state = ctx.query?.state ?? 'closed';

package/agent/routes/issues/list.ts

@@ -1,5 +1,5 @@
 import { createSkill, tool } from '@kevisual/router';
-import { app, cnb } from '../../app.ts';
+import { app, cnbManager } from '../../app.ts';
 import { useKey } from '@kevisual/context';
 
 // 查询 Issue 列表 repo是 kevisual/kevisual
@@ -7,7 +7,7 @@ app.route({
   path: 'cnb',
   key: 'list-issues',
   description: '查询 Issue 列表, 参数 repo, state, keyword, labels, page, page_size 等',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -26,6 +26,7 @@ app.route({
     })
   }
 }).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
   const repo = ctx.query?.repo || useKey('CNB_REPO_SLUG_LOWERCASE');
   const state = ctx.query?.state;
   const keyword = ctx.query?.keyword;

package/agent/routes/knowledge/ai.ts

@@ -1,5 +1,5 @@
 import { createSkill, tool } from '@kevisual/router';
-import { app, cnb } from '../../app.ts';
+import { app, cnbManager } from '../../app.ts';
 import { CNBChat } from '@kevisual/ai/browser'
 import { useKey } from '@kevisual/context';
 
@@ -13,7 +13,7 @@ app.route({
   path: 'cnb',
   key: 'cnb-ai-chat',
   description: '调用cnb的知识库ai对话功能进行聊天',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -27,6 +27,7 @@ app.route({
     })
   }
 }).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
   const question = ctx.query?.question;
   if (!question) {
     ctx.body = { content: '请提供有效的消息内容' };
@@ -89,7 +90,7 @@ app.route({
   path: 'cnb',
   key: 'cnb-rag-query',
   description: '调用cnb的知识库RAG查询功能进行问答',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -103,6 +104,7 @@ app.route({
     })
   }
 }).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
   const question = ctx.query?.question;
   if (!question) {
     ctx.body = { content: '请提供有效的消息内容' };

package/agent/routes/repo/list.ts

@@ -1,5 +1,5 @@
 import { createSkill, tool } from '@kevisual/router';
-import { app, cnb } from '../../app.ts';
+import { app, cnbManager } from '../../app.ts';
 
 // "列出我的代码仓库，search blog"
 // 列出我的知识库的代码仓库
@@ -7,7 +7,7 @@ app.route({
   path: 'cnb',
   key: 'list-repos',
   description: '列出我的代码仓库',
-  middleware: ['auth-admin'],
+  middleware: ['auth'],
   metadata: {
     tags: ['opencode'],
     ...createSkill({
@@ -22,6 +22,7 @@ app.route({
     })
   }
 }).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
   const search = ctx.query?.search;
   const pageSize = ctx.query?.pageSize || 9999;
   const flags = ctx.query?.flags;