@kevisual/cnb 0.0.43 → 0.0.44

package/agent/modules/cnb-manager.ts

@@ -67,6 +67,7 @@ export class CNBManager {
     if (res.code === 200) {
       const cookie = res.data?.data?.CNB_COOKIE
       const token = res.data?.data?.CNB_API_KEY
+      console.log('从配置中心获取 CNB 配置', { cookie, token })
       if (token) {
         return this.addCNB({ username, token, cookie })
       }
@@ -94,6 +95,7 @@ export class CNBManager {
     const kevisualToken = ctx.query?.token;
     const item = await this.getCNB({ username, kevisualToken });
     if (!item) {
+      console.error('CNB 配置项不存在', username, item)
       ctx.throw(400, '不存在的 CNB 配置项，请检查 登录 Token 是否正确，或添加 CNB 配置')
     }
     return item;

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

@@ -9,7 +9,7 @@ app.route({
   middleware: ['auth'],
 
 }).define(async (ctx) => {
-  const tokenUser = ctx.tokenUser;
+  const tokenUser = ctx.state?.tokenUser;
   if (!tokenUser) {
     ctx.throw(401, '未授权');
   }
@@ -29,7 +29,8 @@ app.route({
   description: '获取我的cnb配置',
   middleware: ['auth'],
 }).define(async (ctx) => {
-  const username = ctx.tokenUser?.username;
+  const tokenUser = ctx.state?.tokenUser;
+  const username = tokenUser?.username;
   const token = ctx.query?.token;
   if (!username) {
     ctx.throw(400, '未授权');

package/dist/cli.js

@@ -24105,6 +24105,8 @@ class KnowledgeBase extends CNBCore {
 }
 
 // src/repo/index.ts
+var import_dayjs = __toESM(require_dayjs_min(), 1);
+
 class Repo extends CNBCore {
   constructor(options) {
     super(options);
@@ -24140,6 +24142,11 @@ class Repo extends CNBCore {
     const preCommitSha = commitList.length > 0 ? commitList[0].sha : undefined;
     if (!data.parent_commit_sha && preCommitSha) {
       data.parent_commit_sha = preCommitSha;
+    } else if (data.parent_commit_sha) {
+      if (!data.new_branch) {
+        const date5 = import_dayjs.default().format("MMDDHHmm");
+        data.new_branch = `refs/heads/${date5}`;
+      }
     }
     const url3 = `${this.hackURL}/${repo}/-/git/commits`;
     const postData = {
@@ -46014,6 +46021,7 @@ class CNBManager {
     if (res.code === 200) {
       const cookie = res.data?.data?.CNB_COOKIE;
       const token = res.data?.data?.CNB_API_KEY;
+      console.log("从配置中心获取 CNB 配置", { cookie, token });
       if (token) {
         return this.addCNB({ username, token, cookie });
       }
@@ -46036,6 +46044,7 @@ class CNBManager {
     const kevisualToken = ctx.query?.token;
     const item = await this.getCNB({ username, kevisualToken });
     if (!item) {
+      console.error("CNB 配置项不存在", username, item);
       ctx.throw(400, "不存在的 CNB 配置项，请检查 登录 Token 是否正确，或添加 CNB 配置");
     }
     return item;
@@ -60059,7 +60068,7 @@ app.route({
 }).addTo(app);
 
 // agent/routes/cnb-board/live/live-content.ts
-var import_dayjs = __toESM(require_dayjs_min(), 1);
+var import_dayjs2 = __toESM(require_dayjs_min(), 1);
 import os2 from "node:os";
 import { execSync as execSync2 } from "node:child_process";
 var getLiveMdContent = (opts) => {
@@ -60273,8 +60282,8 @@ var createOSInfo = (more = false) => {
     description: "当前目录磁盘使用情况"
   });
   if (startTimer) {
-    const buildStartTime = import_dayjs.default(startTimer).format("YYYY-MM-DD HH:mm:ss");
-    const buildStartTimestamp = import_dayjs.default(startTimer).valueOf();
+    const buildStartTime = import_dayjs2.default(startTimer).format("YYYY-MM-DD HH:mm:ss");
+    const buildStartTimestamp = import_dayjs2.default(startTimer).valueOf();
     const buildUptime = Date.now() - buildStartTimestamp;
     const buildUptimeStr = formatUptime(Math.floor(buildUptime / 1000));
     const maxRunTime = useKey("CNB_PIPELINE_MAX_RUN_TIME") || 0;
@@ -60290,7 +60299,7 @@ var createOSInfo = (more = false) => {
       description: `构建已运行时间: ${buildUptimeStr}`
     });
     if (maxRunTime > 0) {
-      const now = import_dayjs.default();
+      const now = import_dayjs2.default();
       const today4am = now.hour(4).minute(0).second(0).millisecond(0);
       let timeTo4 = today4am.valueOf() - now.valueOf();
       if (timeTo4 < 0) {
@@ -60844,7 +60853,7 @@ app.route({
   description: "清理我的cnb-manager记录",
   middleware: ["auth"]
 }).define(async (ctx) => {
-  const tokenUser = ctx.tokenUser;
+  const tokenUser = ctx.state?.tokenUser;
   if (!tokenUser) {
     ctx.throw(401, "未授权");
   }
@@ -60863,7 +60872,8 @@ app.route({
   description: "获取我的cnb配置",
   middleware: ["auth"]
 }).define(async (ctx) => {
-  const username = ctx.tokenUser?.username;
+  const tokenUser = ctx.state?.tokenUser;
+  const username = tokenUser?.username;
   const token2 = ctx.query?.token;
   if (!username) {
     ctx.throw(400, "未授权");

package/dist/opencode.js

@@ -22012,6 +22012,8 @@ class KnowledgeBase extends CNBCore {
 }
 
 // src/repo/index.ts
+var import_dayjs = __toESM(require_dayjs_min(), 1);
+
 class Repo extends CNBCore {
   constructor(options) {
     super(options);
@@ -22047,6 +22049,11 @@ class Repo extends CNBCore {
     const preCommitSha = commitList.length > 0 ? commitList[0].sha : undefined;
     if (!data.parent_commit_sha && preCommitSha) {
       data.parent_commit_sha = preCommitSha;
+    } else if (data.parent_commit_sha) {
+      if (!data.new_branch) {
+        const date5 = import_dayjs.default().format("MMDDHHmm");
+        data.new_branch = `refs/heads/${date5}`;
+      }
     }
     const url3 = `${this.hackURL}/${repo}/-/git/commits`;
     const postData = {
@@ -43921,6 +43928,7 @@ class CNBManager {
     if (res.code === 200) {
       const cookie = res.data?.data?.CNB_COOKIE;
       const token = res.data?.data?.CNB_API_KEY;
+      console.log("从配置中心获取 CNB 配置", { cookie, token });
       if (token) {
         return this.addCNB({ username, token, cookie });
       }
@@ -43943,6 +43951,7 @@ class CNBManager {
     const kevisualToken = ctx.query?.token;
     const item = await this.getCNB({ username, kevisualToken });
     if (!item) {
+      console.error("CNB 配置项不存在", username, item);
       ctx.throw(400, "不存在的 CNB 配置项，请检查 登录 Token 是否正确，或添加 CNB 配置");
     }
     return item;
@@ -57966,7 +57975,7 @@ app.route({
 }).addTo(app);
 
 // agent/routes/cnb-board/live/live-content.ts
-var import_dayjs = __toESM(require_dayjs_min(), 1);
+var import_dayjs2 = __toESM(require_dayjs_min(), 1);
 import os2 from "node:os";
 import { execSync as execSync2 } from "node:child_process";
 var getLiveMdContent = (opts) => {
@@ -58180,8 +58189,8 @@ var createOSInfo = (more = false) => {
     description: "当前目录磁盘使用情况"
   });
   if (startTimer) {
-    const buildStartTime = import_dayjs.default(startTimer).format("YYYY-MM-DD HH:mm:ss");
-    const buildStartTimestamp = import_dayjs.default(startTimer).valueOf();
+    const buildStartTime = import_dayjs2.default(startTimer).format("YYYY-MM-DD HH:mm:ss");
+    const buildStartTimestamp = import_dayjs2.default(startTimer).valueOf();
     const buildUptime = Date.now() - buildStartTimestamp;
     const buildUptimeStr = formatUptime(Math.floor(buildUptime / 1000));
     const maxRunTime = useKey("CNB_PIPELINE_MAX_RUN_TIME") || 0;
@@ -58197,7 +58206,7 @@ var createOSInfo = (more = false) => {
       description: `构建已运行时间: ${buildUptimeStr}`
     });
     if (maxRunTime > 0) {
-      const now = import_dayjs.default();
+      const now = import_dayjs2.default();
       const today4am = now.hour(4).minute(0).second(0).millisecond(0);
       let timeTo4 = today4am.valueOf() - now.valueOf();
       if (timeTo4 < 0) {
@@ -58751,7 +58760,7 @@ app.route({
   description: "清理我的cnb-manager记录",
   middleware: ["auth"]
 }).define(async (ctx) => {
-  const tokenUser = ctx.tokenUser;
+  const tokenUser = ctx.state?.tokenUser;
   if (!tokenUser) {
     ctx.throw(401, "未授权");
   }
@@ -58770,7 +58779,8 @@ app.route({
   description: "获取我的cnb配置",
   middleware: ["auth"]
 }).define(async (ctx) => {
-  const username = ctx.tokenUser?.username;
+  const tokenUser = ctx.state?.tokenUser;
+  const username = tokenUser?.username;
   const token2 = ctx.query?.token;
   if (!username) {
     ctx.throw(400, "未授权");

package/dist/routes.d.ts

@@ -282,6 +282,12 @@ declare class Repo extends CNBCore {
     createRepo(data: CreateRepoData): Promise<any>;
     deleteRepoCookie(repo: string): Promise<any>;
     deleteRepo(repo: string): Promise<any>;
+    /**
+     * 使用cookie创建提交，如果没有指定parent_commit_sha，则会自动获取最新的提交作为父提交
+     * @param repo
+     * @param data
+     * @returns
+     */
     createCommit(repo: string, data: CreateCommitData): Promise<any>;
     createBlobs(repo: string, data: {
         content: string;

package/dist/routes.js

@@ -22012,6 +22012,8 @@ class KnowledgeBase extends CNBCore {
 }
 
 // src/repo/index.ts
+var import_dayjs = __toESM(require_dayjs_min(), 1);
+
 class Repo extends CNBCore {
   constructor(options) {
     super(options);
@@ -22047,6 +22049,11 @@ class Repo extends CNBCore {
     const preCommitSha = commitList.length > 0 ? commitList[0].sha : undefined;
     if (!data.parent_commit_sha && preCommitSha) {
       data.parent_commit_sha = preCommitSha;
+    } else if (data.parent_commit_sha) {
+      if (!data.new_branch) {
+        const date5 = import_dayjs.default().format("MMDDHHmm");
+        data.new_branch = `refs/heads/${date5}`;
+      }
     }
     const url3 = `${this.hackURL}/${repo}/-/git/commits`;
     const postData = {
@@ -43921,6 +43928,7 @@ class CNBManager {
     if (res.code === 200) {
       const cookie = res.data?.data?.CNB_COOKIE;
       const token = res.data?.data?.CNB_API_KEY;
+      console.log("从配置中心获取 CNB 配置", { cookie, token });
       if (token) {
         return this.addCNB({ username, token, cookie });
       }
@@ -43943,6 +43951,7 @@ class CNBManager {
     const kevisualToken = ctx.query?.token;
     const item = await this.getCNB({ username, kevisualToken });
     if (!item) {
+      console.error("CNB 配置项不存在", username, item);
       ctx.throw(400, "不存在的 CNB 配置项，请检查 登录 Token 是否正确，或添加 CNB 配置");
     }
     return item;
@@ -57966,7 +57975,7 @@ app.route({
 }).addTo(app);
 
 // agent/routes/cnb-board/live/live-content.ts
-var import_dayjs = __toESM(require_dayjs_min(), 1);
+var import_dayjs2 = __toESM(require_dayjs_min(), 1);
 import os2 from "node:os";
 import { execSync as execSync2 } from "node:child_process";
 var getLiveMdContent = (opts) => {
@@ -58180,8 +58189,8 @@ var createOSInfo = (more = false) => {
     description: "当前目录磁盘使用情况"
   });
   if (startTimer) {
-    const buildStartTime = import_dayjs.default(startTimer).format("YYYY-MM-DD HH:mm:ss");
-    const buildStartTimestamp = import_dayjs.default(startTimer).valueOf();
+    const buildStartTime = import_dayjs2.default(startTimer).format("YYYY-MM-DD HH:mm:ss");
+    const buildStartTimestamp = import_dayjs2.default(startTimer).valueOf();
     const buildUptime = Date.now() - buildStartTimestamp;
     const buildUptimeStr = formatUptime(Math.floor(buildUptime / 1000));
     const maxRunTime = useKey("CNB_PIPELINE_MAX_RUN_TIME") || 0;
@@ -58197,7 +58206,7 @@ var createOSInfo = (more = false) => {
       description: `构建已运行时间: ${buildUptimeStr}`
     });
     if (maxRunTime > 0) {
-      const now = import_dayjs.default();
+      const now = import_dayjs2.default();
       const today4am = now.hour(4).minute(0).second(0).millisecond(0);
       let timeTo4 = today4am.valueOf() - now.valueOf();
       if (timeTo4 < 0) {
@@ -58751,7 +58760,7 @@ app.route({
   description: "清理我的cnb-manager记录",
   middleware: ["auth"]
 }).define(async (ctx) => {
-  const tokenUser = ctx.tokenUser;
+  const tokenUser = ctx.state?.tokenUser;
   if (!tokenUser) {
     ctx.throw(401, "未授权");
   }
@@ -58770,7 +58779,8 @@ app.route({
   description: "获取我的cnb配置",
   middleware: ["auth"]
 }).define(async (ctx) => {
-  const username = ctx.tokenUser?.username;
+  const tokenUser = ctx.state?.tokenUser;
+  const username = tokenUser?.username;
   const token2 = ctx.query?.token;
   if (!username) {
     ctx.throw(400, "未授权");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/cnb",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "",
   "main": "index.js",
   "basename": "/root/cnb",
@@ -17,8 +17,8 @@
   },
   "keywords": [],
   "bin": {
-    "cnb": "./bin/index.js",
-    "cloud": "./bin/index.js"
+    "cnb": "bin/index.js",
+    "cloud": "bin/index.js"
   },
   "files": [
     "dist",
@@ -74,4 +74,4 @@
     "./src/*": "./src/*",
     "./agent/*": "./agent/*"
   }
-}
+}

package/readme.md

@@ -1,5 +1,6 @@
 # cnb.cool 能做什么
 
+所有的代码仓库，只基于一个准则 `group/repo`
 ## 简介
 
 纯粹调用api的模式去使用cnb.cool，自动化方案。

package/src/repo/index.ts

@@ -1,5 +1,5 @@
 import { CNBCore, CNBCoreOptions, RequestOptions, Result } from "../cnb-core.ts";
-
+import dayjs from "dayjs";
 export class Repo extends CNBCore {
   constructor(options: CNBCoreOptions) {
     super(options);
@@ -30,6 +30,12 @@ export class Repo extends CNBCore {
     const url = `/${repo}`;
     return this.delete({ url });
   }
+  /**
+   * 使用cookie创建提交，如果没有指定parent_commit_sha，则会自动获取最新的提交作为父提交
+   * @param repo 
+   * @param data 
+   * @returns 
+   */
   async createCommit(repo: string, data: CreateCommitData): Promise<any> {
     const commitList = await this.getCommitList(repo, {
       page: 1,
@@ -41,6 +47,12 @@ export class Repo extends CNBCore {
     const preCommitSha = commitList.length > 0 ? commitList[0].sha : undefined;
     if (!data.parent_commit_sha && preCommitSha) {
       data.parent_commit_sha = preCommitSha;
+    } else if (data.parent_commit_sha) {
+      // 如果指定了parent_commi_sha;
+      if (!data.new_branch) {
+        const date = dayjs().format('MMDDHHmm');
+        data.new_branch = `refs/heads/${date}`;
+      }
     }
     const url = `${this.hackURL}/${repo}/-/git/commits`;
     const postData: CreateCommitData = {
@@ -52,6 +64,7 @@ export class Repo extends CNBCore {
       new_branch: data.new_branch || 'refs/heads/main',
     };
     if (!postData.parent_commit_sha) {
+      // 如果没有父提交sha，则说明是第一次提交，可以删除parent_commit_sha和base_branch字段
       delete postData.parent_commit_sha;
       delete postData.base_branch;
     }