@kevisual/cnb 0.0.65 → 0.0.66

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/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/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/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('?')) {
+    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/cli-live.js

@@ -4,49 +4,31 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-function __accessProp(key) {
-  return this[key];
-}
-var __toESMCache_node;
-var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
-  var canCache = mod != null && typeof mod === "object";
-  if (canCache) {
-    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
-    var cached = cache.get(mod);
-    if (cached)
-      return cached;
-  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: __accessProp.bind(mod, key),
+        get: () => mod[key],
         enumerable: true
       });
-  if (canCache)
-    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
-var __returnValue = (v) => v;
-function __exportSetter(name, newValue) {
-  this[name] = __returnValue.bind(null, newValue);
-}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: __exportSetter.bind(all, name)
+      set: (newValue) => all[name] = () => newValue
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/constants.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/constants.js
 var require_constants = __commonJS((exports, module) => {
   var BINARY_TYPES = ["nodebuffer", "arraybuffer", "fragments"];
   var hasBlob = typeof Blob !== "undefined";
@@ -66,7 +48,7 @@ var require_constants = __commonJS((exports, module) => {
   };
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/buffer-util.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/buffer-util.js
 var require_buffer_util = __commonJS((exports, module) => {
   var { EMPTY_BUFFER } = require_constants();
   var FastBuffer = Buffer[Symbol.species];
@@ -127,7 +109,7 @@ var require_buffer_util = __commonJS((exports, module) => {
   };
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/limiter.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/limiter.js
 var require_limiter = __commonJS((exports, module) => {
   var kDone = Symbol("kDone");
   var kRun = Symbol("kRun");
@@ -159,7 +141,7 @@ var require_limiter = __commonJS((exports, module) => {
   module.exports = Limiter;
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/permessage-deflate.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/permessage-deflate.js
 var require_permessage_deflate = __commonJS((exports, module) => {
   var zlib = __require("zlib");
   var bufferUtil = require_buffer_util();
@@ -423,7 +405,7 @@ var require_permessage_deflate = __commonJS((exports, module) => {
   }
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/validation.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/validation.js
 var require_validation = __commonJS((exports, module) => {
   var { isUtf8 } = __require("buffer");
   var { hasBlob } = require_constants();
@@ -603,7 +585,7 @@ var require_validation = __commonJS((exports, module) => {
   }
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/receiver.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/receiver.js
 var require_receiver = __commonJS((exports, module) => {
   var { Writable } = __require("stream");
   var PerMessageDeflate = require_permessage_deflate();
@@ -984,7 +966,7 @@ var require_receiver = __commonJS((exports, module) => {
   module.exports = Receiver;
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/sender.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/sender.js
 var require_sender = __commonJS((exports, module) => {
   var { Duplex } = __require("stream");
   var { randomFillSync } = __require("crypto");
@@ -1338,7 +1320,7 @@ var require_sender = __commonJS((exports, module) => {
   }
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/event-target.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/event-target.js
 var require_event_target = __commonJS((exports, module) => {
   var { kForOnEventAttribute, kListener } = require_constants();
   var kCode = Symbol("kCode");
@@ -1489,7 +1471,7 @@ var require_event_target = __commonJS((exports, module) => {
   }
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/extension.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/extension.js
 var require_extension = __commonJS((exports, module) => {
   var { tokenChars } = require_validation();
   function push(dest, name, elem) {
@@ -1654,7 +1636,7 @@ var require_extension = __commonJS((exports, module) => {
   module.exports = { format, parse };
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket.js
 var require_websocket = __commonJS((exports, module) => {
   var EventEmitter = __require("events");
   var https = __require("https");
@@ -2416,7 +2398,7 @@ var require_websocket = __commonJS((exports, module) => {
   }
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/stream.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/stream.js
 var require_stream = __commonJS((exports, module) => {
   var WebSocket = require_websocket();
   var { Duplex } = __require("stream");
@@ -2519,7 +2501,7 @@ var require_stream = __commonJS((exports, module) => {
   module.exports = createWebSocketStream;
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/subprotocol.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/subprotocol.js
 var require_subprotocol = __commonJS((exports, module) => {
   var { tokenChars } = require_validation();
   function parse(header) {
@@ -2564,7 +2546,7 @@ var require_subprotocol = __commonJS((exports, module) => {
   module.exports = { parse };
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket-server.js
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket-server.js
 var require_websocket_server = __commonJS((exports, module) => {
   var EventEmitter = __require("events");
   var http = __require("http");
@@ -2866,7 +2848,7 @@ var require_websocket_server = __commonJS((exports, module) => {
   }
 });
 
-// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/wrapper.mjs
+// node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/wrapper.mjs
 var exports_wrapper = {};
 __export(exports_wrapper, {
   default: () => wrapper_default,
@@ -2886,7 +2868,7 @@ var init_wrapper = __esm(() => {
   wrapper_default = import_websocket.default;
 });
 
-// ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/error.js
+// node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/error.js
 var require_error = __commonJS((exports) => {
   class CommanderError extends Error {
     constructor(exitCode, code, message) {
@@ -2910,7 +2892,7 @@ var require_error = __commonJS((exports) => {
   exports.InvalidArgumentError = InvalidArgumentError;
 });
 
-// ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/argument.js
+// node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/argument.js
 var require_argument = __commonJS((exports) => {
   var { InvalidArgumentError } = require_error();
 
@@ -2990,7 +2972,7 @@ var require_argument = __commonJS((exports) => {
   exports.humanReadableArgName = humanReadableArgName;
 });
 
-// ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/help.js
+// node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/help.js
 var require_help = __commonJS((exports) => {
   var { humanReadableArgName } = require_argument();
 
@@ -3347,7 +3329,7 @@ ${itemIndentStr}`);
   exports.stripColor = stripColor;
 });
 
-// ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/option.js
+// node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/option.js
 var require_option = __commonJS((exports) => {
   var { InvalidArgumentError } = require_error();
 
@@ -3531,7 +3513,7 @@ var require_option = __commonJS((exports) => {
   exports.DualOptions = DualOptions;
 });
 
-// ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/suggestSimilar.js
+// node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/suggestSimilar.js
 var require_suggestSimilar = __commonJS((exports) => {
   var maxDistance = 3;
   function editDistance(a, b) {
@@ -3604,7 +3586,7 @@ var require_suggestSimilar = __commonJS((exports) => {
   exports.suggestSimilar = suggestSimilar;
 });
 
-// ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/command.js
+// node_modules/.pnpm/commander@14.0.3/node_modules/commander/lib/command.js
 var require_command = __commonJS((exports) => {
   var EventEmitter = __require("node:events").EventEmitter;
   var childProcess = __require("node:child_process");
@@ -4959,7 +4941,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
   exports.useColor = useColor;
 });
 
-// ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/index.js
+// node_modules/.pnpm/commander@14.0.3/node_modules/commander/index.js
 var require_commander = __commonJS((exports) => {
   var { Argument } = require_argument();
   var { Command } = require_command();
@@ -5172,11 +5154,11 @@ function createKeepAlive(config) {
   return client;
 }
 
-// agent/live.ts
+// agent/clis/live.ts
 import { readFileSync } from "node:fs";
 import path from "node:path";
 
-// ../../node_modules/.pnpm/commander@14.0.3/node_modules/commander/esm.mjs
+// node_modules/.pnpm/commander@14.0.3/node_modules/commander/esm.mjs
 var import__ = __toESM(require_commander(), 1);
 var {
   program,
@@ -5192,7 +5174,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";