@kevisual/cnb 0.0.28 → 0.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/cnb",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -16,7 +16,7 @@
   ],
   "author": "abearxiong <xiongxiao@xiongxiao.me> (https://www.xiongxiao.me)",
   "license": "MIT",
-  "packageManager": "pnpm@10.30.1",
+  "packageManager": "pnpm@10.30.2",
   "type": "module",
   "devDependencies": {
     "@kevisual/ai": "^0.0.24",
@@ -24,7 +24,7 @@
     "@kevisual/dts": "^0.0.4",
     "@kevisual/context": "^0.0.8",
     "@kevisual/types": "^0.0.12",
-    "@opencode-ai/plugin": "^1.2.10",
+    "@opencode-ai/plugin": "^1.2.12",
     "@types/bun": "^1.3.9",
     "@types/node": "^25.3.0",
     "@types/ws": "^8.18.1",
@@ -38,8 +38,8 @@
     "zod": "^4.3.6"
   },
   "dependencies": {
-    "@kevisual/query": "^0.0.49",
-    "@kevisual/router": "^0.0.80",
+    "@kevisual/query": "^0.0.52",
+    "@kevisual/router": "^0.0.84",
     "@kevisual/use-config": "^1.0.30",
     "es-toolkit": "^1.44.0",
     "nanoid": "^5.1.6",
@@ -52,6 +52,7 @@
     "./opencode": "./dist/opencode.js",
     "./keep": "./dist/keep.js",
     "./keep.ts": "./src/keep.ts",
+    "./keep-file-live.ts": "./src/workspace/keep-file-live.ts",
     "./routes": "./dist/routes.js",
     "./src/*": "./src/*",
     "./agent/*": "./agent/*"

package/src/cnb-core.ts

@@ -79,7 +79,7 @@ export class CNBCore {
       }
       delete _headers.Authorization;
     }
-    console.log('Request URL:', url, data, _headers);
+    // console.log('Request URL:', url, data, _headers);
     const response = await fetch(url || '', {
       method,
       headers: _headers,

package/src/user/index.ts

@@ -16,6 +16,18 @@ export class User extends CNBCore {
       useCookie: true,
     });
   }
+  /**
+   * 判断当前 Cookie 是否有效
+   * @returns 
+   */
+  async checkCookieValid(): Promise<Result> {
+    const user = await this.getCurrentUser();
+    if (user.code === 200) {
+      return { code: 200, message: 'cookie valid' };
+    } else {
+      return { code: 401, message: 'cookie invalid' };
+    }
+  }
   /**
    * 使用 Token 获取用户信息
    * @returns

package/src/workspace/index.ts

@@ -113,7 +113,62 @@ export class Workspace extends CNBCore {
 
     return this.post({ url: `/${repo}/-/workspace/start`, data });
   }
+  /**
+   * 添加使用cookie获取工作空间访问权限的功能，适用于需要保持工作空间连接状态的场景，
+   * 例如使用 WebSocket 连接工作空间时需要携带 cookie 进行身份验证。
+   * https://cnb.cool/kevisual/dev-env/-/workspace/vscode-web/cnb-708-1ji9sog7o-001
+   * @param repo 
+   * @param pipelineId 
+   * @returns 
+   */
+  async getWorkspaceCookie(repo: string, pipelineId: string): Promise<Result<{ value: string, cookie: string; cookieName: string }>> {
+    const url = `${this.hackURL}/${repo}/-/workspace/vscode-web/${pipelineId}`;
+    const response = await fetch(url, {
+      method: 'GET',
+      redirect: 'manual',
+      headers: {
+        'Cookie': this.cookie || '',
+        'Accept': 'application/json',
+      }
+    });
+
+    // 第一次 302 重定向
+    if (response.status === 302 || response.status === 301) {
+      // 包含token的重定向 URL 通常在 Location 头中返回
+      // 类似 https://cnb-708-1ji9sog7o-001.cnb.space/login?t=orange:workspace:login-token:963691a2-35ce-4fef-a7ba-72723cefd226
+      const loginURL = response.headers.get('Location');
+      // 从 URL 参数中获取 cookieName，例如: orange:workspace:cookie-session:cnb-708-1ji9sog7o-001
+      const cookieName = `orange:workspace:cookie-session:${pipelineId}`;
+      // 第二次请求，也设置为 manual 防止自动重定向
+      const response2 = await fetch(loginURL || '', {
+        method: 'GET',
+        redirect: 'manual',
+        headers: {
+          'Cookie': this.cookie || '',
+          'Accept': 'application/json',
+        }
+      });
+
+      // 第二次 302 重定向，获取最终的 cookie 值
+      if (response2.status === 302 || response2.status === 301) {
+        // 从 Set-Cookie 头中获取 cookie 值
+        const setCookie = response2.headers.get('Set-Cookie');
+        // 解析 cookie 值
+        const cookieValue = setCookie?.split(';')[0]?.split('=')[1] || '';
 
+        return {
+          code: 200,
+          message: 'success',
+          data: { value: cookieValue, cookieName, cookie: `${cookieName}=${cookieValue}` }
+        };
+      }
+
+      // 如果不是重定向，尝试获取 JSON 数据
+      return { code: 500 };
+    }
+
+    return { code: 500, };
+  }
 }
 export interface WorkspaceLinkDetail {
   codebuddy: string;

package/src/workspace/keep-file-live.ts

@@ -0,0 +1,136 @@
+import path from 'node:path';
+import fs from 'node:fs';
+import os from 'node:os';
+import { execSync } from 'node:child_process';
+
+export type KeepAliveData = {
+  wsUrl: string;
+  cookie: string;
+  repo: string;
+  pipelineId: string;
+  createdTime: number;
+  filePath: string;
+  pm2Name: string;
+}
+
+type KeepAliveCache = {
+  data: KeepAliveData[];
+}
+
+const keepAliveFilePath = path.join(os.homedir(), '.cnb/keepAliveCache.json');
+
+export const runLive = (filePath: string, pm2Name: string) => {
+  // 使用 npx 运行命令
+  const cmdArgs = `cnb live -c ${filePath}`;
+
+  // 先停止已存在的同名 pm2 进程
+  const stopCmd = `pm2 delete ${pm2Name} 2>/dev/null || true`;
+  console.log('停止已存在的进程:', stopCmd);
+  try {
+    execSync(stopCmd, { stdio: 'inherit' });
+  } catch (error) {
+    console.log('停止进程失败或进程不存在:', error);
+  }
+
+  // 使用pm2启动
+  const pm2Cmd = `pm2 start ev --name ${pm2Name} --no-autorestart -- ${cmdArgs}`;
+  console.log('执行命令:', pm2Cmd);
+  try {
+    const result = execSync(pm2Cmd, { stdio: 'pipe', encoding: 'utf8' });
+    console.log(result);
+  } catch (error) {
+    console.error("状态码:", error.status);
+    console.error("错误详情:", error.stderr.toString()); // 这里会显示 ev 命令报的具体错误
+  }
+}
+
+export const stopLive = (pm2Name: string): boolean => {
+  const stopCmd = `pm2 delete ${pm2Name} 2>/dev/null || true`;
+  console.log('停止进程:', stopCmd);
+  try {
+    execSync(stopCmd, { stdio: 'inherit' });
+    console.log(`已停止 ${pm2Name} 的保持存活任务`);
+    return true;
+  } catch (error) {
+    console.error('停止进程失败:', error);
+  }
+  return false;
+}
+
+export function getKeepAliveCache(): KeepAliveCache {
+  try {
+    if (fs.existsSync(keepAliveFilePath)) {
+      const data = fs.readFileSync(keepAliveFilePath, 'utf-8');
+      const cache = JSON.parse(data) as KeepAliveCache;
+      return cache;
+    } else {
+      return { data: [] };
+    }
+  } catch (error) {
+    console.error('读取保持存活缓存文件失败:', error);
+    return { data: [] };
+  }
+}
+
+export function addKeepAliveData(data: KeepAliveData): KeepAliveCache {
+  const cache = getKeepAliveCache();
+  cache.data.push(data);
+  runLive(data.filePath, data.pm2Name);
+  try {
+    if (!fs.existsSync(path.dirname(keepAliveFilePath))) {
+      fs.mkdirSync(path.dirname(keepAliveFilePath), { recursive: true });
+    }
+    fs.writeFileSync(keepAliveFilePath, JSON.stringify(cache, null, 2), 'utf-8');
+    return cache;
+  } catch (error) {
+    console.error('写入保持存活缓存文件失败:', error);
+    return { data: [] };
+  }
+}
+
+export function removeKeepAliveData(repo: string, pipelineId: string): KeepAliveCache {
+  const cache = getKeepAliveCache();
+  const item = cache.data.find(item => item.repo === repo && item.pipelineId === pipelineId);
+  if (item) {
+    stopLive(item.pm2Name);
+  }
+  cache.data = cache.data.filter(item => item.repo !== repo || item.pipelineId !== pipelineId);
+  try {
+    fs.writeFileSync(keepAliveFilePath, JSON.stringify(cache, null, 2), 'utf-8');
+    return cache;
+  } catch (error) {
+    console.error('写入保持存活缓存文件失败:', error);
+    return { data: [] };
+  }
+}
+
+export const createLiveData = (data: { wsUrl: string, cookie: string, repo: string, pipelineId: string }): KeepAliveData => {
+  const { wsUrl, cookie, repo, pipelineId } = data;
+  const createdTime = Date.now();
+  const pm2Name = `${repo}__${pipelineId}`.replace(/\//g, '__');
+  const filePath = path.join(os.homedir(), '.cnb', `${pm2Name}.json`);
+  const _newData = { wss: wsUrl, wsUrl, cookie, repo, pipelineId, createdTime, filePath, pm2Name };
+  if (!fs.existsSync(path.dirname(filePath))) {
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  }
+  fs.writeFileSync(filePath, JSON.stringify(_newData, null, 2), 'utf-8');
+  return _newData;
+}
+
+export class KeepAliveManager {
+  static getCache() {
+    return getKeepAliveCache();
+  }
+
+  static add(data: KeepAliveData) {
+    return addKeepAliveData(data);
+  }
+  
+  static createLiveData(data: { wsUrl: string, cookie: string, repo: string, pipelineId: string }): KeepAliveData {
+    return createLiveData(data);
+  }
+
+  static remove(repo: string, pipelineId: string) {
+    return removeKeepAliveData(repo, pipelineId);
+  }
+}