@kevisual/cnb 0.0.65 → 0.0.67

package/agent/cli.ts

@@ -1,6 +1,7 @@
 import { app } from './index.ts';
-import { parse } from '@kevisual/router/src/commander.ts';
-
-await parse({ app: app, description: 'CNB控制台命令行工具', parse: true, exitOnEnd: true })
+import { parse } from '@kevisual/router/commander';
+import { program } from './program.ts'
+import './cmds/quick-cmd.ts'
+await parse({ program, app: app, description: 'CNB控制台命令行工具', parse: true, exitOnEnd: true })
 
 console.log('命令行工具已启动，输入 help 查看可用命令', 'end');

package/agent/clis/deploy.ts

@@ -0,0 +1,8 @@
+import { app } from '../app.ts';
+import { parse } from '@kevisual/router/commander';
+import '../routes/auth/index.ts';
+
+await parse({
+  app: app,
+  exitOnEnd: false
+})

package/agent/{live.ts → clis/live.ts}

@@ -1,4 +1,4 @@
-import { createKeepAlive } from '../src/workspace/keep-live.ts';
+import { createKeepAlive } from '../../src/workspace/keep-live.ts';
 import { readFileSync } from 'node:fs';
 import path from 'node:path';
 import { Command, program } from 'commander';

package/agent/cmds/quick-cmd.ts

@@ -0,0 +1,33 @@
+import { program } from '../program.ts'
+import { app } from '../index.ts';
+
+program.command('release')
+  .description('上传发布文件到指定仓库')
+  .option("-r, --repo <string>", "仓库名称，格式为 owner/repo")
+  .option("-v, --version <string>", "版本号，例如1.0.0，默认为1.0.0")
+  .option("-d, --dir <string>", "相对执行路径的文件夹名称，默认为 dist")
+  .option("--dot", "是否包含点文件，默认为 false")
+  .option("-c, --cwd <string>", "执行命令的当前工作目录，默认为 process.cwd()")
+  .action(async (opts) => {
+    const repo = opts.repo;
+    const version = opts.version || '1.0.0';
+    const dir = opts.dir || 'dist';
+    const cwd = opts.cwd || process.cwd();
+    const dot = !!opts.dot;
+    if (!repo) {
+      console.error('repo 参数必填');
+      process.exit(1);
+    }
+
+    const res = await app.run({
+      path: 'cnb-deploy',
+      key: 'page',
+      payload: {
+        repo,
+        version,
+        dir,
+        cwd,
+        dot
+      }
+    }, { appId: app.appId })
+  })

package/agent/modules/cnb-manager.ts

@@ -48,7 +48,8 @@ export class CNBManager {
   constructor() {
     setInterval(() => {
       this.clearExpiredCNB()
-    }, 1000 * 60 * 30) // 每30分钟清理一次过期的 CNB 实例
+      // unref 定时器，避免阻止进程退出
+    }, 1000 * 60 * 30).unref() // 每30分钟清理一次过期的 CNB 实例
   }
   getDefaultCNB() {
     const cnbItem = this.cnbMap.get('default')

package/agent/program.ts

@@ -0,0 +1,3 @@
+import { program } from 'commander';
+
+export { program }

package/agent/routes/auth/index.ts

@@ -0,0 +1,45 @@
+import { app } from '../../app.ts';
+/**
+ * 验证上下文中的 App ID 是否与指定的 App ID 匹配
+ * @param {any} ctx - 上下文对象，可能包含 appId 属性
+ * @param {string} appId - 需要验证的目标 App ID
+ * @returns {boolean} 如果 ctx 中包含 appId 且匹配则返回 true，否则返回 false
+ * @throws {Error} 如果 ctx 中包含 appId 但不匹配，则抛出 403 错误
+ */
+const checkAppId = (ctx: any, appId: string) => {
+  const _appId = ctx?.app?.appId;
+  if (_appId) {
+    if (_appId !== appId) {
+      ctx.throw(403, 'Invalid App ID');
+    }
+    return true;
+  }
+  return false;
+}
+
+app.route({
+  rid: 'auth',
+  path: 'auth',
+}).define(async (ctx) => {
+  // ctx.body = 'Auth Route';
+  if (checkAppId(ctx, app.appId)) {
+    ctx.state.tokenUser = {
+      username: 'default',
+    }
+    return;
+  }
+}).addTo(app, { overwrite: false });
+
+app.route({
+  rid: 'auth-admin',
+  path: 'auth-admin',
+  middleware: ['auth'],
+}).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/chat/chat.ts

@@ -14,7 +14,9 @@ app.route({
         role: z.enum(['user', 'assistant']).describe('消息角色，user表示用户输入，assistant表示助手回复'),
         content: z.string().describe('消息内容')
       })).describe('对话消息列表，按照时间顺序排列，包含用户和助手的历史消息'),
-      model: z.string().optional().describe('默认auto')
+      model: z.string().optional().describe('默认auto'),
+      isChatBot: z.boolean().optional().describe('纯对话模块, 不执行其他工具模块。'),
+      queryRouterFilter: z.string().optional().describe('查询路由过滤器，格式为SQL Where语法，例如"WHERE path="cnb" "，用于过滤可用的路由列表'),
     }
   }
 }).define(async (ctx) => {
@@ -26,6 +28,8 @@ app.route({
   const model = ctx.args?.model || 'auto'
   const item = await cnbManager.getCNBItem(ctx);
   const cnbAi = item.cnbAi;
+  const isChatBot = ctx.args?.isChatBot ?? false;
+  const queryRouterFilter = ctx.args.queryRouterFilter;
   const messages = ctx.args.messages || [{
     role: 'user',
     content: ctx.args.question
@@ -40,9 +44,10 @@ app.route({
   const result = await runAgent({
     app,
     messages: messages,
-    routes,
+    routes: isChatBot ? [] : routes,
     languageModel: cnbAi(model),
     token: '',
+    query: queryRouterFilter
     // token: ctx.query.token as string,
   });
   ctx.body = result;

package/agent/routes/deploy/file-list.ts

@@ -0,0 +1,43 @@
+import { app, cnbManager } from '../../app.ts';
+import { z } from 'zod';
+import fs from 'node:fs';
+
+app.route({
+  path: 'cnb-deploy',
+  key: 'file-list',
+  description: '部署页面, 程序需要在自己的客户端中执行。',
+  middleware: ['auth'],
+  metadata: {
+    args: {
+      repo: z.string().describe('仓库名称，格式为 owner/repo'),
+      version: z.string().optional().describe('版本号，例如1.0.0，默认为1.0.0'),
+      // dir: z.string().optional().describe('相对执行路径的文件夹名称，默认为 dist'),
+    }
+  }
+}).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
+  const version = ctx.args.version || '1.0.0';
+  const dir = ctx.args.dir || 'dist';
+  const pwd = process.cwd();
+  const repo = ctx.args.repo;
+  const dirPath = `${pwd}/${dir}`;
+  const dot = ctx.args.dot || false;
+  if (!repo) {
+    ctx.throw(400, 'repo 参数必填');
+  }
+  if (!fileIsExist(dirPath)) {
+    ctx.throw(400, `目录 ${dir} 不存在`);
+  }
+  const res = await cnb.release.list(repo, { page: 1, page_size: 50, query: version });
+  ctx.body = res;
+
+}).addTo(app);
+
+const fileIsExist = (filepath: string) => {
+  try {
+    fs.accessSync(filepath, fs.constants.F_OK);
+  } catch (e) {
+    return false;
+  }
+  return true;
+}

package/agent/routes/deploy/index.ts

@@ -0,0 +1,2 @@
+import './upload.ts'
+import './file-list.ts';

package/agent/routes/deploy/upload.ts

@@ -0,0 +1,88 @@
+import { app, cnbManager } from '../../app.ts';
+import { z } from 'zod';
+import glob from 'fast-glob';
+import fs from 'node:fs';
+
+import { uploadReleaseFiles } from '../../../src/release/upload-release.ts'
+import { DefaultIgnore } from '../../../src/upload/upload-base.ts';
+app.route({
+  path: 'cnb-deploy',
+  key: 'page',
+  description: '部署页面,上传对应的文件的内容到指定的仓库，程序需要在自己的客户端中执行。',
+  middleware: ['auth-admin'],
+  metadata: {
+    args: {
+      repo: z.string().describe('仓库名称，格式为 owner/repo'),
+      version: z.string().optional().describe('版本号，例如1.0.0，默认为1.0.0'),
+      dir: z.string().optional().describe('相对执行路径的文件夹名称，默认为 dist'),
+      // filename: z.string().optional().describe('部署文件名称，默认为空，如果存在，dir 不具备作用'),
+      dot: z.boolean().optional().describe('是否包含点文件，默认为 false'),
+      cwd: z.string().optional().describe('执行命令的当前工作目录，默认为 process.cwd()')
+    }
+  }
+}).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
+  const version = ctx.args.version || '1.0.0';
+  const dir = ctx.args.dir || 'dist';
+  const pwd = ctx.args.cwd || process.cwd();
+  const repo = ctx.args.repo;
+  let dirPath = `${pwd}/${dir}`;
+  const dot = ctx.args.dot || false;
+  if (!repo) {
+    ctx.throw(400, 'repo 参数必填');
+  }
+  let dirReg = '';
+  if (dirPath.includes('*') || dirPath.includes('?') || dirPath==='.') {
+    dirReg = dirPath;
+  } else {
+    dirReg = `${dirPath}/**/*`
+  }
+  const files = await glob(dirReg, {
+    cwd: pwd,
+    onlyFiles: true,
+    ignore: DefaultIgnore,
+    dot,
+  });
+  const res = await uploadReleaseFiles({
+    files: files.map(file => ({
+      type: 'file',
+      filepath: file,
+      name: file.replace(`${dirPath}/`, '')
+    })),
+    cnb,
+    repo: repo,
+    version
+  });
+  ctx.body = res;
+
+}).addTo(app);
+
+app.route({
+  path: 'cnb-deploy',
+  key: 'app',
+  description: '部署当前文件夹下的文件列表，根据 packages.json 进行部署，程序需要在自己的客户端中执行。basename 类似 /kevision/cnb, version类似 1.0.0，deploy.dir 类似 dist',
+  middleware: ['auth-admin'],
+}).define(async (ctx) => {
+  try {
+    const pkgs = JSON.parse(fs.readFileSync(`${process.cwd()}/packages.json`, 'utf-8'));
+    let repo: string = pkgs.basename || '';
+    const version = pkgs.version || '1.0.0';
+    if (repo.startsWith('/')) {
+      repo = repo.slice(1);
+    }
+    const dir = pkgs.deploy?.dir || 'dist';
+    const res = await app.run({ path: 'cnb-deploy', key: 'page', payload: { repo, version, dir } });
+    ctx.forward(res);
+  } catch (e) {
+    ctx.throw(500, '部署失败，无法读取 packages.json 文件');
+  }
+}).addTo(app);
+
+const fileIsExist = (filepath: string) => {
+  try {
+    fs.accessSync(filepath, fs.constants.F_OK);
+  } catch (e) {
+    return false;
+  }
+  return true;
+}

package/agent/routes/index.ts

@@ -15,47 +15,5 @@ import './missions/index.ts';
 import './labels/index.ts';
 import './package/index.ts';
 
-/**
- * 验证上下文中的 App ID 是否与指定的 App ID 匹配
- * @param {any} ctx - 上下文对象，可能包含 appId 属性
- * @param {string} appId - 需要验证的目标 App ID
- * @returns {boolean} 如果 ctx 中包含 appId 且匹配则返回 true，否则返回 false
- * @throws {Error} 如果 ctx 中包含 appId 但不匹配，则抛出 403 错误
- */
-const checkAppId = (ctx: any, appId: string) => {
-  const _appId = ctx?.app?.appId;
-  if (_appId) {
-    if (_appId !== appId) {
-      ctx.throw(403, 'Invalid App ID');
-    }
-    return true;
-  }
-  return false;
-}
-
-app.route({
-  rid: 'auth',
-  path: 'auth',
-}).define(async (ctx) => {
-  // ctx.body = 'Auth Route';
-  if (checkAppId(ctx, app.appId)) {
-    ctx.state.tokenUser = {
-      username: 'default',
-    }
-    return;
-  }
-}).addTo(app, { overwrite: false });
-
-app.route({
-  rid: 'auth-admin',
-  path: 'auth-admin',
-  middleware: ['auth'],
-}).define(async (ctx) => {
-  // ctx.body = 'Admin Auth Route';
-  if (checkAppId(ctx, app.appId)) {
-    ctx.state.tokenUser = {
-      username: 'default',
-    }
-    return;
-  }
-}).addTo(app, { overwrite: false });
+import './deploy/index.ts';
+import './auth/index.ts';

package/dist/a/a.txt

@@ -0,0 +1 @@
+abc

package/dist/cli-live.js

@@ -5172,7 +5172,7 @@ function createKeepAlive(config) {
   return client;
 }
 
-// agent/live.ts
+// agent/clis/live.ts
 import { readFileSync } from "node:fs";
 import path from "node:path";
 
@@ -5192,7 +5192,7 @@ var {
   Help
 } = import__.default;
 
-// agent/live.ts
+// agent/clis/live.ts
 program.addCommand(new Command("live").description("启动 CNB Keep Alive 服务").option("-j, --json <string>", "JSON数据").option("-c, --config <string>", "配置文件路径 (优先级高于 JSON 参数), 默认keep.json").action(async (opts) => {
   let config;
   let configPath = opts.config || "keep.json";