Compare commits
78 Commits
f3f1a1d058
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 14f2dad837 | |||
| 915f7aff6b | |||
| 15d81c4f68 | |||
| 48dafc6040 | |||
| 2ccda9f008 | |||
| 6cf3beae94 | |||
| a583fdc211 | |||
| 59b3961ff9 | |||
| ddfdb63598 | |||
| 18a6fd4cfe | |||
| 028a6ac726 | |||
| a911334459 | |||
| 3f899dbd5f | |||
| bb2b129343 | |||
|
|
2eeaf991b9 | ||
| ddba845ce7 | |||
| a4e04e7afa | |||
|
|
398c41a512 | ||
|
|
dbd044ec66 | ||
| 2b55c2bd03 | |||
| 89470346be | |||
| 9f20e149a0 | |||
| 26b4ffa3a2 | |||
| 43992d896f | |||
| 5e5f4f6543 | |||
| fee5076e16 | |||
| 91d4fed474 | |||
| 5395449751 | |||
| 2cb12644ea | |||
| e1b86aa809 | |||
| 2f79925e3d | |||
| 0b5a0557ee | |||
| b9b4c993f4 | |||
| 99f01e2b94 | |||
| cc043bfd7e | |||
| 327f115ef2 | |||
| 6a375db5a1 | |||
| a5ce44ba70 | |||
| 2011ea818c | |||
| 146fde274e | |||
| 8549a4aa53 | |||
| 4f541748da | |||
| 4723efbbd2 | |||
| 3de89b6985 | |||
| a90f98ef3f | |||
| 9647fcf48f | |||
| f1f2d81201 | |||
| 9f580a7709 | |||
| 91409861b9 | |||
| ff7e6aa152 | |||
| a52ac525bf | |||
| 371d66b289 | |||
| 4bdebd66d4 | |||
| 03be62cfe6 | |||
| f12fea7246 | |||
| 8007315c66 | |||
| 11ac3f9de9 | |||
| 36628c8279 | |||
| b3c5e7d68d | |||
| 864766be4a | |||
| bafe51f140 | |||
| bf4c0c6d71 | |||
| 2ca71aea5d | |||
| fb2b2d4d6f | |||
| 91fdd6abc3 | |||
| c77578805a | |||
| ca1c3706b2 | |||
| 6e1ffe173a | |||
| 5b610fd600 | |||
| b9624e4f6f | |||
| 8f29ddb449 | |||
| 22de8cad52 | |||
| 73d98a1209 | |||
| 6b96a22c7a | |||
| 2393cbefbb | |||
| 0ca5989a40 | |||
| 48f2695367 | |||
| 7d4bc37c09 |
44
.cnb.yml
Normal file
44
.cnb.yml
Normal file
@@ -0,0 +1,44 @@
|
||||
# .cnb.yml
|
||||
include:
|
||||
- https://cnb.cool/kevisual/cnb/-/blob/main/.cnb/template.yml
|
||||
|
||||
.common_env: &common_env
|
||||
env:
|
||||
TO_REPO: kevisual/cli
|
||||
TO_URL: git.xiongxiao.me
|
||||
imports:
|
||||
- https://cnb.cool/kevisual/env/-/blob/main/.env.development
|
||||
|
||||
$:
|
||||
vscode:
|
||||
- docker:
|
||||
image: docker.cnb.cool/kevisual/dev-env:latest
|
||||
services:
|
||||
- vscode
|
||||
- docker
|
||||
imports: !reference [.common_env, imports]
|
||||
# 开发环境启动后会执行的任务
|
||||
# stages:
|
||||
# - name: pnpm install
|
||||
# script: pnpm install
|
||||
stages: !reference [.dev_tempalte, stages]
|
||||
|
||||
.common_sync_to_gitea: &common_sync_to_gitea
|
||||
- <<: *common_env
|
||||
services: !reference [.common_sync_to_gitea_template, services]
|
||||
stages: !reference [.common_sync_to_gitea_template, stages]
|
||||
|
||||
.common_sync_from_gitea: &common_sync_from_gitea
|
||||
- <<: *common_env
|
||||
services: !reference [.common_sync_from_gitea_template, services]
|
||||
stages: !reference [.common_sync_from_gitea_template, stages]
|
||||
|
||||
main:
|
||||
web_trigger_sync_to_gitea:
|
||||
- <<: *common_sync_to_gitea
|
||||
web_trigger_sync_from_gitea:
|
||||
- <<: *common_sync_from_gitea
|
||||
api_trigger_sync_to_gitea:
|
||||
- <<: *common_sync_to_gitea
|
||||
api_trigger_sync_from_gitea:
|
||||
- <<: *common_sync_from_gitea
|
||||
11
.cnb/web_trigger.yml
Normal file
11
.cnb/web_trigger.yml
Normal file
@@ -0,0 +1,11 @@
|
||||
# .cnb/web_trigger.yml
|
||||
branch:
|
||||
# 如下按钮在分支名以 release 开头的分支详情页面显示
|
||||
- reg: "^main"
|
||||
buttons:
|
||||
- name: 同步代码到gitea
|
||||
description: 同步代码到gitea
|
||||
event: web_trigger_sync_to_gitea
|
||||
- name: 同步gitea代码到当前仓库
|
||||
description: 同步gitea代码到当前仓库
|
||||
event: web_trigger_sync_from_gitea
|
||||
5
.gitignore
vendored
5
.gitignore
vendored
@@ -4,7 +4,10 @@ node_modules
|
||||
dist
|
||||
|
||||
pack-dist
|
||||
apps
|
||||
|
||||
assistant-app
|
||||
|
||||
build
|
||||
.pnpm-store
|
||||
|
||||
jwt
|
||||
1
.npmrc
1
.npmrc
@@ -1,2 +1,3 @@
|
||||
//npm.xiongxiao.me/:_authToken=${ME_NPM_TOKEN}
|
||||
//npm.cnb.cool/kevisual/registry/-/packages/:_authToken=${CNB_API_KEY}
|
||||
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
|
||||
1
.opencode/plugin/agenat.ts
Normal file
1
.opencode/plugin/agenat.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { AgentPlugin } from "../../assistant/src/main.ts";
|
||||
2
apps/.gitignore
vendored
2
apps/.gitignore
vendored
@@ -1,2 +0,0 @@
|
||||
container
|
||||
root
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"name": "apps",
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"main": "index.js",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC"
|
||||
}
|
||||
4
assistant/.gitignore
vendored
4
assistant/.gitignore
vendored
@@ -10,4 +10,6 @@ assistant-app
|
||||
.env*
|
||||
!.env*example
|
||||
|
||||
libs
|
||||
libs
|
||||
|
||||
cache-file
|
||||
1
assistant/.opencode/plugin/agent.ts
Normal file
1
assistant/.opencode/plugin/agent.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { AgentPlugin } from "../../src/main.ts";
|
||||
35
assistant/.opencode/skills/kill-opencode/SKILL.md
Normal file
35
assistant/.opencode/skills/kill-opencode/SKILL.md
Normal file
@@ -0,0 +1,35 @@
|
||||
---
|
||||
name: kill-opencode
|
||||
description: 自动查找并杀死所有opencode相关的进程,确保系统资源释放。
|
||||
tags:
|
||||
- opencode
|
||||
- process-management
|
||||
- automation
|
||||
---
|
||||
```bash
|
||||
#!/bin/bash
|
||||
# kill_opencode.sh - 自动杀死所有opencode进程
|
||||
echo "正在查找opencode进程..."
|
||||
ps aux | grep opencode | grep -v grep
|
||||
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "正在杀死所有opencode进程..."
|
||||
pkill -f opencode
|
||||
sleep 2
|
||||
|
||||
# 检查是否还有残留进程
|
||||
remaining=$(ps aux | grep opencode | grep -v grep | wc -l)
|
||||
if [ $remaining -gt 0 ]; then
|
||||
echo "发现 $remaining 个顽固进程,使用强制杀死模式..."
|
||||
pkill -9 -f opencode
|
||||
fi
|
||||
|
||||
echo "opencode进程清理完成!"
|
||||
else
|
||||
echo "未找到opencode进程"
|
||||
fi
|
||||
|
||||
# 验证是否已完全清理
|
||||
echo "当前opencode进程状态:"
|
||||
ps aux | grep opencode | grep -v grep || echo "没有运行中的opencode进程"
|
||||
```
|
||||
204
assistant/AGENTS.md
Normal file
204
assistant/AGENTS.md
Normal file
@@ -0,0 +1,204 @@
|
||||
# AGENTS.md
|
||||
|
||||
## 构建、代码检查和测试命令
|
||||
|
||||
### 核心命令
|
||||
|
||||
```bash
|
||||
# 开发
|
||||
bun run dev # 运行主入口 (src/run.ts)
|
||||
bun run dev:server # 启动服务器(热重载)
|
||||
bun run dev:cnb # 使用自定义配置目录启动服务器
|
||||
bun run dev:share # 测试远程应用
|
||||
|
||||
# 构建
|
||||
bun run build # 完整生产构建(先清理 dist)
|
||||
bun run build:lib # 构建库文件
|
||||
bun run postbuild:lib # 生成 TypeScript 类型定义
|
||||
|
||||
# 包管理
|
||||
pnpm install # 安装依赖(使用 pnpm v10.28.0)
|
||||
```
|
||||
|
||||
### 环境要求
|
||||
|
||||
- **Node.js**: >=22.0.0
|
||||
- **运行时**: Bun(开发环境)/ Node.js(生产环境)
|
||||
- **包管理器**: pnpm@10.28.0(强制要求)
|
||||
|
||||
### 环境变量
|
||||
|
||||
- `ASSISTANT_CONFIG_DIR`: 覆盖助手配置文件目录路径
|
||||
- `BUN_PATH`: 覆盖 Bun 可执行文件路径
|
||||
|
||||
---
|
||||
|
||||
## 代码风格规范
|
||||
|
||||
### TypeScript
|
||||
|
||||
- **严格模式**: 通过扩展配置启用(`@kevisual/types/json/backend.json`)
|
||||
- **模块格式**: 仅 ESM(`package.json` 中的 `"type": "module"`)
|
||||
- **目标**: NodeNext 模块解析
|
||||
- **路径别名**: 使用 `@/*` 作为本地导入别名(如 `import { Foo } from '@/module/foo'`)
|
||||
|
||||
### 导入规则
|
||||
|
||||
```typescript
|
||||
// Node.js 内置模块必须使用 node: 协议
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { execSync } from 'node:child_process';
|
||||
|
||||
// 外部包(不使用路径别名)
|
||||
import chalk from 'chalk';
|
||||
import { program } from 'commander';
|
||||
|
||||
// 本地模块(使用 @ 别名)
|
||||
import { AssistantInit } from '@/services/init/index.ts';
|
||||
|
||||
// 类型导入
|
||||
import type { AssistantConfig } from '@/module/assistant/index.ts';
|
||||
```
|
||||
|
||||
### 命名规范
|
||||
|
||||
| 类型 | 规范 | 示例 |
|
||||
|------|------|------|
|
||||
| 类 | PascalCase | `AssistantInit`, `AssistantApp`, `AssistantQuery` |
|
||||
| 接口 | PascalCase | `ProxyInfo`, `AssistantInitOptions` |
|
||||
| 类型 | PascalCase | `AssistantConfigData` |
|
||||
| 函数 | camelCase | `getBunPath`, `checkFileExists`, `parseHomeArg` |
|
||||
| 变量 | camelCase | `configDir`, `assistantConfig`, `isPortAvailable` |
|
||||
| 私有字段 | `#` 前缀 + camelCase | `#query`, `#config` |
|
||||
| 常量 | UPPER_SNAKE_CASE 或 camelCase | `commonPaths`, `randomId` |
|
||||
| 文件名 | kebab-case | `proxy-page-index.ts`, `query-login.ts` |
|
||||
| 目录名 | kebab-case | `query-login`, `hot-api` |
|
||||
|
||||
### 代码模式
|
||||
|
||||
#### 错误处理
|
||||
|
||||
```typescript
|
||||
// 同步操作包装
|
||||
try {
|
||||
const result = fs.readFileSync(path);
|
||||
return result;
|
||||
} catch (error) {
|
||||
console.error('读取文件错误:', error.message);
|
||||
continue; // 或 return/throw
|
||||
}
|
||||
|
||||
// 异步操作包装
|
||||
try {
|
||||
const result = await someAsyncOperation();
|
||||
return result;
|
||||
} catch (error) {
|
||||
console.error('操作失败:', error.message);
|
||||
process.exit(1); // 或 throw/return undefined
|
||||
}
|
||||
```
|
||||
|
||||
#### 上下文/依赖注入
|
||||
|
||||
使用 `@kevisual/use-config` 进行上下文管理:
|
||||
|
||||
```typescript
|
||||
export const assistantConfig = useContextKey<AssistantInit>('assistantConfig', () => {
|
||||
return new AssistantInit({
|
||||
path: configDir,
|
||||
init: isInit,
|
||||
});
|
||||
});
|
||||
```
|
||||
|
||||
#### 路由模式
|
||||
|
||||
使用 `@kevisual/router` 的 App 和 SimpleRouter:
|
||||
|
||||
```typescript
|
||||
app.route({
|
||||
path: 'router',
|
||||
key: 'list',
|
||||
description: '获取路由列表',
|
||||
}).define(async (ctx) => {
|
||||
ctx.body = { list };
|
||||
}).addTo(app);
|
||||
```
|
||||
|
||||
### JSDoc 文档
|
||||
|
||||
为公共 API、复杂函数和类型添加文档:
|
||||
|
||||
```typescript
|
||||
/**
|
||||
* 助手初始化类
|
||||
* @class AssistantInit
|
||||
*/
|
||||
export class AssistantInit extends AssistantConfig {}
|
||||
|
||||
/**
|
||||
* @param {string} p - 要解析的路径
|
||||
* @returns {string} 解析后的绝对路径
|
||||
*/
|
||||
export const w = (p: string) => path.join(__dirname, p);
|
||||
```
|
||||
|
||||
### 文件组织
|
||||
|
||||
- **路由**: `src/routes/` 和 `src/routes-simple/`
|
||||
- **模块**: `src/module/`(功能模块)
|
||||
- **服务**: `src/services/`(公共服务)
|
||||
- **命令**: `src/command/`(CLI 命令)
|
||||
- **查询**: `src/query/`(API/查询逻辑)
|
||||
- **入口文件**:
|
||||
- `src/index.ts` - 主 CLI 入口
|
||||
- `src/server.ts` - 服务器入口
|
||||
- `src/run.ts` - 开发运行器
|
||||
- `src/run-server.ts` - 服务器运行器
|
||||
|
||||
### 控制台输出
|
||||
|
||||
使用 `chalk` 实现彩色输出:
|
||||
|
||||
```typescript
|
||||
console.log(chalk.blue('助手路径不存在,正在创建...'));
|
||||
console.log(chalk.yellow('助手路径已存在'), chalk.green(assistantConfig.configDir));
|
||||
console.error(chalk.red('启动服务器错误:'), error.message);
|
||||
```
|
||||
|
||||
### 系统检测
|
||||
|
||||
```typescript
|
||||
const isWindows = process.platform === 'win32';
|
||||
const bunExecutableName = isWindows ? 'bun.exe' : 'bun';
|
||||
```
|
||||
|
||||
### 端口处理
|
||||
|
||||
```typescript
|
||||
import getPort, { portNumbers } from 'get-port';
|
||||
|
||||
const port = await getPort({ port: 51515 });
|
||||
const availablePort = await getPort({ port: portNumbers(51515, 52000) });
|
||||
```
|
||||
|
||||
### 关键依赖
|
||||
|
||||
- `@kevisual/router` - 应用路由
|
||||
- `@kevisual/query` - API 查询
|
||||
- `@kevisual/use-config` - 配置/上下文
|
||||
- `commander` - CLI 参数解析
|
||||
- `chalk` - 终端颜色
|
||||
- `ws` - WebSocket(通过 `@kevisual/ws`)
|
||||
- `pm2` - 进程管理(生产环境)
|
||||
|
||||
### 重要说明
|
||||
|
||||
1. 开发时始终使用 `bun`,但构建输出以 Node.js 为目标
|
||||
2. 打包时外部包必须在 `bun.config.mjs` 的 `external` 数组中声明
|
||||
3. 库构建排除 `pm2`
|
||||
4. 以 `ENVISION_*` 为前缀的环境变量在构建时可用
|
||||
5. 项目在业务逻辑中广泛使用中文注释
|
||||
6. 私有类成员应使用 `#` 前缀语法
|
||||
7. 操作前始终使用 `checkFileExists` 检查文件是否存在
|
||||
@@ -6,7 +6,7 @@ import fs from 'node:fs';
|
||||
// bun run src/index.ts --
|
||||
import { fileURLToPath } from 'node:url';
|
||||
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
||||
const external = ['pm2', '@kevisual/hot-api'];
|
||||
const external = ['pm2', '@kevisual/hot-api', '@nut-tree-fork/nut-js', 'bun'];
|
||||
/**
|
||||
*
|
||||
* @param {string} p
|
||||
@@ -40,6 +40,28 @@ await Bun.build({
|
||||
},
|
||||
external,
|
||||
});
|
||||
|
||||
await Bun.build({
|
||||
target: 'node',
|
||||
format: 'esm',
|
||||
entrypoints: [w('./src/main.ts')],
|
||||
outdir: w('./dist'),
|
||||
naming: {
|
||||
entry: 'assistant-opencode.js',
|
||||
},
|
||||
define: {
|
||||
ENVISION_VERSION: JSON.stringify(pkg.version),
|
||||
},
|
||||
external,
|
||||
});
|
||||
|
||||
const dts = 'dts -i src/main.ts -o assistant-opencode.d.ts';
|
||||
Bun.spawnSync({
|
||||
cmd: ['sh', '-c', dts],
|
||||
cwd: __dirname,
|
||||
stdout: 'inherit',
|
||||
stderr: 'inherit',
|
||||
});
|
||||
// const copyDist = ['dist', 'bin'];
|
||||
const copyDist = ['dist'];
|
||||
export const copyFileToEnvision = async () => {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@kevisual/assistant-cli",
|
||||
"version": "0.0.6",
|
||||
"version": "0.0.8",
|
||||
"description": "",
|
||||
"main": "dist/assistant.mjs",
|
||||
"keywords": [
|
||||
@@ -10,7 +10,7 @@
|
||||
],
|
||||
"author": "abearxiong <xiongxiao@xiongxiao.me> (https://www.xiongxiao.me)",
|
||||
"license": "MIT",
|
||||
"packageManager": "pnpm@10.25.0",
|
||||
"packageManager": "pnpm@10.28.1",
|
||||
"type": "module",
|
||||
"files": [
|
||||
"dist",
|
||||
@@ -21,11 +21,11 @@
|
||||
"scripts": {
|
||||
"dev": "bun run src/run.ts ",
|
||||
"dev:server": "bun --watch src/run-server.ts ",
|
||||
"dev:cnb": "ASSISTANT_CONFIG_DIR=/workspace bun --watch src/run-server.ts ",
|
||||
"dev:share": "bun --watch src/test/remote-app.ts ",
|
||||
"build:lib": "bun run bun-lib.config.mjs",
|
||||
"postbuild:lib": "dts -i src/lib.ts -o assistant-lib.d.ts -d libs -t",
|
||||
"build": "rimraf dist && bun run bun.config.mjs",
|
||||
"postbuild": "pnpm run build:lib"
|
||||
"build": "rimraf dist && bun run bun.config.mjs"
|
||||
},
|
||||
"bin": {
|
||||
"ev-assistant": "bin/assistant.js",
|
||||
@@ -41,18 +41,19 @@
|
||||
}
|
||||
},
|
||||
"devDependencies": {
|
||||
"@kevisual/ai": "^0.0.19",
|
||||
"@kevisual/ai": "^0.0.22",
|
||||
"@kevisual/api": "^0.0.26",
|
||||
"@kevisual/load": "^0.0.6",
|
||||
"@kevisual/local-app-manager": "^0.1.32",
|
||||
"@kevisual/logger": "^0.0.4",
|
||||
"@kevisual/query": "0.0.32",
|
||||
"@kevisual/query": "0.0.38",
|
||||
"@kevisual/query-login": "0.0.7",
|
||||
"@kevisual/router": "^0.0.37",
|
||||
"@kevisual/types": "^0.0.10",
|
||||
"@kevisual/use-config": "^1.0.21",
|
||||
"@types/bun": "^1.3.4",
|
||||
"@types/lodash-es": "^4.17.12",
|
||||
"@types/node": "^24.10.2",
|
||||
"@kevisual/router": "^0.0.62",
|
||||
"@kevisual/types": "^0.0.12",
|
||||
"@kevisual/use-config": "^1.0.28",
|
||||
"@opencode-ai/plugin": "^1.1.36",
|
||||
"@types/bun": "^1.3.6",
|
||||
"@types/node": "^25.0.10",
|
||||
"@types/send": "^1.2.1",
|
||||
"@types/ws": "^8.18.1",
|
||||
"chalk": "^5.6.2",
|
||||
@@ -61,11 +62,11 @@
|
||||
"dayjs": "^1.11.19",
|
||||
"dotenv": "^17.2.3",
|
||||
"get-port": "^7.1.0",
|
||||
"inquirer": "^13.0.2",
|
||||
"lodash-es": "^4.17.21",
|
||||
"inquirer": "^13.2.1",
|
||||
"nanoid": "^5.1.6",
|
||||
"send": "^1.2.0",
|
||||
"send": "^1.2.1",
|
||||
"supports-color": "^10.2.2",
|
||||
"table": "^6.9.0",
|
||||
"ws": "npm:@kevisual/ws"
|
||||
},
|
||||
"engines": {
|
||||
@@ -75,12 +76,17 @@
|
||||
"access": "public"
|
||||
},
|
||||
"dependencies": {
|
||||
"@kevisual/hot-api": "^0.0.3",
|
||||
"@nut-tree-fork/nut-js": "^4.2.6",
|
||||
"eventemitter3": "^5.0.1",
|
||||
"@aws-sdk/client-s3": "^3.975.0",
|
||||
"@kevisual/ha-api": "^0.0.6",
|
||||
"@kevisual/js-filter": "^0.0.5",
|
||||
"@kevisual/oss": "^0.0.16",
|
||||
"@kevisual/video-tools": "^0.0.13",
|
||||
"@opencode-ai/sdk": "^1.1.36",
|
||||
"es-toolkit": "^1.44.0",
|
||||
"eventemitter3": "^5.0.4",
|
||||
"lowdb": "^7.0.1",
|
||||
"lru-cache": "^11.2.4",
|
||||
"pm2": "^6.0.14",
|
||||
"unstorage": "^1.17.3"
|
||||
"unstorage": "^1.17.4"
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,19 @@
|
||||
# assistant cli
|
||||
|
||||
## 初始化路径
|
||||
## 安装
|
||||
|
||||
## 启动服务
|
||||
```bash
|
||||
npm i -g @kevisual/cli --registry=https://npm.cnb.cool/kevisual/registry/-/packages/
|
||||
```
|
||||
## 环境变量配置项
|
||||
|
||||
## 配置
|
||||
- ASSISTANT_CONFIG_DIR
|
||||
- 说明:指定 assistant 的配置文件目录
|
||||
- 示例:`export ASSISTANT_CONFIG_DIR=/path/to/your/config/dir`
|
||||
|
||||
|
||||
## 启动命令
|
||||
|
||||
```bash
|
||||
asst server -s -p 8686
|
||||
```
|
||||
@@ -1,10 +1,13 @@
|
||||
import { App } from '@kevisual/router';
|
||||
import { HttpsPem } from '@/module/assistant/https/sign.ts';
|
||||
import { SimpleRouter } from '@kevisual/router/simple'
|
||||
// import { App } from '@kevisual/router/src/app.ts';
|
||||
// import { AssistantConfig } from '@/module/assistant/index.ts';
|
||||
|
||||
import { AssistantInit, parseHomeArg } from '@/services/init/index.ts';
|
||||
import { configDir as HomeConfigDir } from '@/module/assistant/config/index.ts';
|
||||
import { useContextKey } from '@kevisual/use-config/context';
|
||||
import { AssistantQuery } from '@/module/assistant/query/index.ts';
|
||||
|
||||
const manualParse = parseHomeArg(HomeConfigDir);
|
||||
const _configDir = manualParse.configDir;
|
||||
export const configDir = AssistantInit.detectConfigDir(_configDir);
|
||||
@@ -13,6 +16,7 @@ export const assistantConfig = useContextKey<AssistantInit>('assistantConfig', (
|
||||
return new AssistantInit({
|
||||
path: configDir,
|
||||
init: isInit,
|
||||
initWorkspace: manualParse.isOpencode ? false : true,
|
||||
});
|
||||
});
|
||||
|
||||
@@ -20,8 +24,6 @@ export const assistantQuery = useContextKey('assistantQuery', () => {
|
||||
return new AssistantQuery(assistantConfig);
|
||||
});
|
||||
|
||||
const httpsPem = new HttpsPem(assistantConfig);
|
||||
|
||||
export const runtime = useContextKey('runtime', () => {
|
||||
return {
|
||||
type: 'client',
|
||||
@@ -29,32 +31,30 @@ export const runtime = useContextKey('runtime', () => {
|
||||
});
|
||||
|
||||
export const app: App = useContextKey<App>('app', () => {
|
||||
const init = isInit;
|
||||
if (init) {
|
||||
const config = assistantConfig.getConfig();
|
||||
|
||||
if (config?.https?.type !== 'https') {
|
||||
console.log('http模式', 'http');
|
||||
return new App({
|
||||
serverOptions: {
|
||||
path: '/client/router',
|
||||
httpType: 'http',
|
||||
cors: {
|
||||
origin: '*',
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
return new App({
|
||||
serverOptions: {
|
||||
path: '/client/router',
|
||||
httpType: 'https',
|
||||
httpsCert: httpsPem.cert,
|
||||
httpsKey: httpsPem.key,
|
||||
httpType: 'http',
|
||||
cors: {
|
||||
origin: '*',
|
||||
}
|
||||
},
|
||||
io: true
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
export const simpleRouter = useContextKey('simpleRouter', () => {
|
||||
return new SimpleRouter();
|
||||
});
|
||||
|
||||
app.route({
|
||||
path: 'router',
|
||||
key: 'list',
|
||||
description: '获取路由列表',
|
||||
}).define(async (ctx) => {
|
||||
const list = ctx.app.getList((item) => {
|
||||
if (item?.path?.includes('auth') || item?.id?.includes('auth')) return false;
|
||||
return true;
|
||||
})
|
||||
ctx.body = { list }
|
||||
}).addTo(app);
|
||||
@@ -1,6 +1,7 @@
|
||||
import { AssistantApp } from '@/module/assistant/index.ts';
|
||||
import { program, Command, assistantConfig } from '@/program.ts';
|
||||
import { AppDownload } from '@/services/app/index.ts';
|
||||
import { table } from 'table';
|
||||
|
||||
const appManagerCommand = new Command('app-manager').alias('am').description('Manage Assistant Apps 管理本地的应用模块');
|
||||
program.addCommand(appManagerCommand);
|
||||
@@ -8,11 +9,43 @@ program.addCommand(appManagerCommand);
|
||||
appManagerCommand
|
||||
.command('list')
|
||||
.description('List all installed apps')
|
||||
.action(async () => {
|
||||
.option('-s, --status <status>', '列出状态信息, 可选值: running, stopped, inactive')
|
||||
.option('-w, --wide', '显示更多信息')
|
||||
.action(async (opts) => {
|
||||
const manager = new AssistantApp(assistantConfig);
|
||||
await manager.loadConfig();
|
||||
const showInfos = manager.getAllAppShowInfo();
|
||||
console.log('Installed Apps:', showInfos);
|
||||
let showInfos = manager.getAllAppShowInfo();
|
||||
const isWide = opts.wide ?? false;
|
||||
let header = [];
|
||||
if (!isWide) {
|
||||
showInfos = showInfos.map((item) => {
|
||||
return { key: item.key, status: item.status };
|
||||
});
|
||||
header = ['Key', 'Status'];
|
||||
}
|
||||
if (opts.status) {
|
||||
const showList = showInfos.filter(info => info.status === opts.status);
|
||||
if (showList.length === 0) {
|
||||
console.log(`No apps with status: ${opts.status}`);
|
||||
return;
|
||||
}
|
||||
const teables = showList.map(item => Object.values(item));
|
||||
teables.unshift(header);
|
||||
console.log('App Start Info:\n')
|
||||
console.log(table(teables));
|
||||
return
|
||||
}
|
||||
if (showInfos.length === 0) {
|
||||
console.log('No installed apps found.');
|
||||
return;
|
||||
}
|
||||
header = Object.keys(showInfos[0]);;
|
||||
const teables = showInfos.map(item => Object.values(item));
|
||||
teables.unshift(header);
|
||||
|
||||
console.log('Installed Apps:\n')
|
||||
console.log(table(teables));
|
||||
|
||||
});
|
||||
|
||||
appManagerCommand
|
||||
|
||||
@@ -6,19 +6,19 @@ import inquirer from 'inquirer';
|
||||
import chalk from 'chalk';
|
||||
|
||||
type InitCommandOptions = {
|
||||
path?: string;
|
||||
workspace?: string;
|
||||
};
|
||||
const Init = new Command('init')
|
||||
.description('初始化一个助手客户端,生成配置文件。')
|
||||
.option('-p --path <path>', '助手路径,默认为执行命令的目录,如果助手路径不存在则创建。')
|
||||
.option('-w --workspace <workspace>', '助手路径,默认为执行命令的目录,如果助手路径不存在则创建。')
|
||||
.action((opts: InitCommandOptions) => {
|
||||
// 如果path参数存在,检测path是否是相对路径,如果是相对路径,则转换为绝对路径
|
||||
if (opts.path && !opts.path.startsWith('/')) {
|
||||
opts.path = path.join(process.cwd(), opts.path);
|
||||
} else if (opts.path) {
|
||||
opts.path = path.resolve(opts.path);
|
||||
// 如果workspace参数存在,检测workspace是否是相对路径,如果是相对路径,则转换为绝对路径
|
||||
if (opts.workspace && !opts.workspace.startsWith('/')) {
|
||||
opts.workspace = path.join(process.cwd(), opts.workspace);
|
||||
} else if (opts.workspace) {
|
||||
opts.workspace = path.resolve(opts.workspace);
|
||||
}
|
||||
const configDir = AssistantInit.detectConfigDir(opts.path);
|
||||
const configDir = AssistantInit.detectConfigDir(opts.workspace);
|
||||
console.log('configDir', configDir);
|
||||
const assistantInit = new AssistantInit({
|
||||
path: configDir,
|
||||
|
||||
@@ -1,34 +1,97 @@
|
||||
import { program, Command, assistantConfig } from '@/program.ts';
|
||||
import { spawnSync } from 'node:child_process';
|
||||
const runScriptsCommand = new Command('run-scripts')
|
||||
.alias('run')
|
||||
.arguments('<cmd> [env]')
|
||||
.description('运行脚本,在assistant.config.json中配置的脚本')
|
||||
.action(async (cmd, env) => {
|
||||
assistantConfig.checkMounted();
|
||||
const configs = assistantConfig.getCacheAssistantConfig();
|
||||
const scripts = configs?.scripts || {};
|
||||
try {
|
||||
const script = scripts[cmd];
|
||||
if (!script) {
|
||||
console.error(`Script "${cmd}" not found.`);
|
||||
return;
|
||||
import path from 'node:path';
|
||||
import fs from 'node:fs';
|
||||
import { AssistantApp, checkFileExists } from '@/lib.ts';
|
||||
import { logger } from '@/module/logger.ts';
|
||||
import { LoadApp, StopApp } from '@/module/local-apps/src/modules/manager.ts';
|
||||
|
||||
const createRandomApp = (opts: { app: any, package: any, pwd: string, status?: string }) => {
|
||||
const { app, package: packageJson, pwd } = opts;
|
||||
if (!app.status) {
|
||||
app.status = opts.status || 'running'
|
||||
}
|
||||
if (!app.key) {
|
||||
const randomSuffix = Math.random().toString(36).substring(2, 8);
|
||||
app.key = packageJson.basename || `${'unknown-app'}-${randomSuffix}`;
|
||||
}
|
||||
app.path = pwd;
|
||||
if (app.type === 'pm2-system-app' && !app.pm2Options) {
|
||||
app.pm2Options = {
|
||||
cwd: pwd,
|
||||
}
|
||||
}
|
||||
return app;
|
||||
}
|
||||
const start = new Command('start')
|
||||
.description('获取package.json中app参数并启动对应的app')
|
||||
.option('-s --save', '保存应用信息到assistant配置中', false)
|
||||
.action(async (opts) => {
|
||||
// assistantConfig.checkMounted();
|
||||
const pwd = process.cwd();
|
||||
const packageJsonPath = path.join(pwd, 'package.json');
|
||||
if (checkFileExists(packageJsonPath) === false) {
|
||||
logger.error('package.json 在当前目录未找到,请在包含 package.json 的目录下运行此命令。');
|
||||
return
|
||||
}
|
||||
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
|
||||
const appKey = packageJson.app;
|
||||
if (!appKey) {
|
||||
logger.error('package.json 中未找到 app 字段,请确保在 package.json 中正确配置 app 字段。');
|
||||
return
|
||||
}
|
||||
const app = createRandomApp({ app: packageJson.app, package: packageJson, pwd });
|
||||
if (app.type !== 'system-app') {
|
||||
const load = await LoadApp(app, {});
|
||||
if (!load) {
|
||||
logger.error(`未能加载应用, 请确保应用名称正确且已安装。`, app.type);
|
||||
return
|
||||
}
|
||||
// console.log(`Running script "${script}"...`);
|
||||
const command = [script, ...(env ? [env] : [])].join(' ');
|
||||
// console.log(`Command: ${command}`, env);
|
||||
const res = spawnSync(command, { shell: true, stdio: 'inherit', cwd: assistantConfig.configDir });
|
||||
if (res.error) {
|
||||
console.error(`Error running script "${cmd}":`, res.error);
|
||||
return;
|
||||
}
|
||||
if (res.status !== 0) {
|
||||
console.error(`Script "${cmd}" exited with code ${res.status}`);
|
||||
return;
|
||||
}
|
||||
console.log(`Script "${cmd}" run successfully.`);
|
||||
} catch (error) {
|
||||
console.error(`Failed to run script "${cmd}":`, error);
|
||||
} else {
|
||||
LoadApp(app, {}).then(() => {
|
||||
logger.info(`系统应用已启动: ${app.key}`);
|
||||
}).catch((err) => {
|
||||
logger.error(`启动系统应用失败: ${app.key}`, err);
|
||||
});
|
||||
}
|
||||
|
||||
if (opts.save) {
|
||||
assistantConfig.checkMounted();
|
||||
const manager = new AssistantApp(assistantConfig, app);
|
||||
await manager.loadConfig();
|
||||
await manager.saveAppInfo(app);
|
||||
}
|
||||
});
|
||||
program.addCommand(runScriptsCommand);
|
||||
|
||||
program.addCommand(start);
|
||||
|
||||
const stop = new Command('stop')
|
||||
.description('获取package.json中app参数并停止对应的app')
|
||||
.option('-t --todo <todo>', '停止应用,在pm2中如果为stop则停止,如果为remove则删除,默认为stop', 'stop')
|
||||
.option('-s --save', '保存应用信息到assistant配置中', false)
|
||||
.action(async (opts) => {
|
||||
// assistantConfig.checkMounted();
|
||||
const pwd = process.cwd();
|
||||
const packageJsonPath = path.join(pwd, 'package.json');
|
||||
if (checkFileExists(packageJsonPath) === false) {
|
||||
logger.error('package.json 在当前目录未找到,请在包含 package.json 的目录下运行此命令。');
|
||||
return
|
||||
}
|
||||
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
|
||||
const appKey = packageJson.app;
|
||||
if (!appKey) {
|
||||
logger.error('package.json 中未找到 app 字段,请确保在 package.json 中正确配置 app 字段。');
|
||||
return
|
||||
}
|
||||
const app = createRandomApp({ app: packageJson.app, package: packageJson, pwd, status: 'stopped' });
|
||||
await StopApp(app, { todo: opts.todo });
|
||||
if (opts.save) {
|
||||
assistantConfig.checkMounted();
|
||||
const manager = new AssistantApp(assistantConfig, app);
|
||||
await manager.loadConfig();
|
||||
await manager.removeApp(app.key, { deleteFile: false });
|
||||
}
|
||||
});
|
||||
|
||||
program.addCommand(stop);
|
||||
|
||||
|
||||
9
assistant/src/main.ts
Normal file
9
assistant/src/main.ts
Normal file
@@ -0,0 +1,9 @@
|
||||
import { app } from './app.ts';
|
||||
import { type Plugin } from "@opencode-ai/plugin"
|
||||
import { createRouterAgentPluginFn } from '@kevisual/router/opencode';
|
||||
import './routes/index.ts';
|
||||
import './routes-simple/index.ts';
|
||||
|
||||
export const AgentPlugin: Plugin = createRouterAgentPluginFn({
|
||||
router: app,
|
||||
})
|
||||
@@ -4,10 +4,18 @@ import fs from 'fs';
|
||||
import { checkFileExists, createDir } from '../file/index.ts';
|
||||
import { ProxyInfo } from '../proxy/proxy.ts';
|
||||
import dotenv from 'dotenv';
|
||||
import { logger } from '@/module/logger.ts';
|
||||
|
||||
let kevisualDir = path.join(homedir(), 'kevisual');
|
||||
const envKevisualDir = process.env.ASSISTANT_CONFIG_DIR
|
||||
if (envKevisualDir) {
|
||||
kevisualDir = envKevisualDir;
|
||||
logger.debug('使用环境变量 ASSISTANT_CONFIG_DIR 作为 kevisual 目录:', kevisualDir);
|
||||
}
|
||||
/**
|
||||
* 助手配置文件路径, 全局配置文件目录
|
||||
*/
|
||||
export const configDir = createDir(path.join(homedir(), 'kevisual/assistant-app'));
|
||||
export const configDir = createDir(path.join(kevisualDir, 'assistant-app'));
|
||||
|
||||
/**
|
||||
* 助手配置文件初始化
|
||||
@@ -61,52 +69,115 @@ export const initConfig = (configRootPath: string) => {
|
||||
export type ReturnInitConfigType = ReturnType<typeof initConfig>;
|
||||
|
||||
type AuthPermission = {
|
||||
type?: 'auth-proxy' | 'public' | 'private' | 'project';
|
||||
share?: 'public' | 'private' | 'protected';
|
||||
username?: string; // 用户名
|
||||
admin?: Omit<AuthPermission, 'admin'>;
|
||||
admin?: string[];
|
||||
};
|
||||
export type AssistantConfigData = {
|
||||
pageApi?: string; // https://kevisual.cn
|
||||
app?: {
|
||||
/**
|
||||
* 应用ID, 唯一标识,识别是那个设备
|
||||
*/
|
||||
id?: string;
|
||||
/**
|
||||
* 应用地址
|
||||
*/
|
||||
url?: string;
|
||||
}
|
||||
token?: string;
|
||||
registry?: string; // https://kevisual.cn
|
||||
/**
|
||||
* 前端代理,比如/root/home 转到https://kevisual.cn/root/home
|
||||
* path?: string;
|
||||
* target?: string;
|
||||
* pathname?: string;
|
||||
* 例子: { path: '/root/home', target: 'https://kevisual.cn', pathname: '/root/home' }
|
||||
*/
|
||||
proxy?: ProxyInfo[];
|
||||
apiProxyList?: ProxyInfo[];
|
||||
/**
|
||||
* Router代理, 会自动获取 {path: 'router', key: 'list'}的路由信息,然后注入到整个router应用当中.
|
||||
* 例子: { proxy: [ { type: 'router', api: 'https://localhost:50002/api/router' } ] }
|
||||
* base: 是否使用 /api/router的基础路径,默认false
|
||||
* lightcode: 是否启用lightcode路由,默认false
|
||||
*/
|
||||
router?: {
|
||||
proxy: ProxyInfo[];
|
||||
base?: boolean;
|
||||
lightcode?: boolean;
|
||||
}
|
||||
/**
|
||||
* API 代理配置, 比如,api开头的,v1开头的等等
|
||||
*/
|
||||
api?: {
|
||||
proxy?: ProxyInfo[];
|
||||
}
|
||||
description?: string;
|
||||
/**
|
||||
* 服务启动
|
||||
* 服务启动,
|
||||
* path是配置 127.0.0.1
|
||||
* port是配置端口号
|
||||
*/
|
||||
server?: {
|
||||
path?: string;
|
||||
port?: number;
|
||||
};
|
||||
/**
|
||||
* 被远程调用配置
|
||||
* url: 远程应用地址 https://kevisual.cn/ws/proxy
|
||||
* enabled: 是否启用远程应用
|
||||
*/
|
||||
share?: {
|
||||
url: string;
|
||||
enabled?: boolean; // 是否启用远程应用
|
||||
name: string;
|
||||
enabled?: boolean;
|
||||
};
|
||||
/**
|
||||
* 对pages目录文件监听
|
||||
*/
|
||||
watch?: {
|
||||
enabled?: boolean;
|
||||
};
|
||||
/**
|
||||
* 首页
|
||||
* 首页, 访问 `/` 自动会打开的首页地址
|
||||
* 例如: /root/home
|
||||
*/
|
||||
home?: string;
|
||||
/**
|
||||
* 启用AI代理
|
||||
*/
|
||||
ai?: {
|
||||
enabled?: boolean;
|
||||
provider?: string | 'DeepSeek' | 'SiliconFlow';
|
||||
provider?: string | 'DeepSeek' | 'Custom';
|
||||
apiKey?: string;
|
||||
model?: string;
|
||||
};
|
||||
scripts?: {
|
||||
[key: string]: string;
|
||||
};
|
||||
/** 阿里云的语音识别服务,模型 qwen3-asr-flash-realtime */
|
||||
asr?: {
|
||||
enabled?: boolean;
|
||||
token?: string;
|
||||
}
|
||||
/**
|
||||
* 认证和权限配置
|
||||
* share: protected 需要认证代理访问(默认), public 公开访问, private 私有访问
|
||||
* share 是对外共享 pages 目录下的页面
|
||||
*/
|
||||
auth?: AuthPermission;
|
||||
https?: {
|
||||
type?: 'https' | 'http';
|
||||
keyPath?: string; // 证书私钥路径
|
||||
certPath?: string; // 证书路径
|
||||
};
|
||||
storage?: AssistantStorage[];
|
||||
};
|
||||
type AssistantStorage = FileStorage | S3Storage;
|
||||
type FileStorage = {
|
||||
id: string;
|
||||
path: string;
|
||||
type: 'local'
|
||||
}
|
||||
type S3Storage = {
|
||||
id: string;
|
||||
bucket: string;
|
||||
region: string;
|
||||
accessKeyId: string;
|
||||
secretAccessKey: string;
|
||||
endpoint?: string;
|
||||
type: 's3' | 'minio';
|
||||
}
|
||||
let assistantConfig: AssistantConfigData;
|
||||
type AssistantConfigOptions = {
|
||||
configDir?: string;
|
||||
@@ -132,22 +203,25 @@ export class AssistantConfig {
|
||||
}
|
||||
return this.#configPath;
|
||||
}
|
||||
init() {
|
||||
this.configPath = initConfig(this.configDir);
|
||||
init(configDir?: string) {
|
||||
this.configPath = initConfig(configDir || this.configDir);
|
||||
this.isMountedConfig = true;
|
||||
}
|
||||
|
||||
checkMounted() {
|
||||
if (!this.isMountedConfig) {
|
||||
this.init();
|
||||
}
|
||||
}
|
||||
getConfigPath() { }
|
||||
getConfig() {
|
||||
getConfig(): AssistantConfigData {
|
||||
try {
|
||||
if (!checkFileExists(this.configPath.configPath)) {
|
||||
fs.writeFileSync(this.configPath.configPath, JSON.stringify({ proxy: [] }, null, 2));
|
||||
return {
|
||||
pageApi: '',
|
||||
app: {
|
||||
url: 'https://kevisual.cn',
|
||||
},
|
||||
proxy: [],
|
||||
};
|
||||
}
|
||||
@@ -156,7 +230,9 @@ export class AssistantConfig {
|
||||
} catch (error) {
|
||||
console.error('file read', error.message);
|
||||
return {
|
||||
pageApi: '',
|
||||
app: {
|
||||
url: 'https://kevisual.cn',
|
||||
},
|
||||
proxy: [],
|
||||
};
|
||||
}
|
||||
@@ -169,14 +245,19 @@ export class AssistantConfig {
|
||||
}
|
||||
getRegistry() {
|
||||
const config = this.getCacheAssistantConfig();
|
||||
return config?.registry || config?.pageApi;
|
||||
return config?.registry || config?.app?.url || 'https://kevisual.cn';
|
||||
}
|
||||
/**
|
||||
* 设置 assistant-config.json 配置
|
||||
* @param config
|
||||
* @returns
|
||||
*/
|
||||
setConfig(config?: AssistantConfigData) {
|
||||
setConfig(config?: AssistantConfigData, force?: boolean) {
|
||||
if (force) {
|
||||
this.config = config || {};
|
||||
fs.writeFileSync(this.configPath.configPath, JSON.stringify(this.config, null, 2));
|
||||
return this.config;
|
||||
}
|
||||
const myConfig = this.getCacheAssistantConfig();
|
||||
const newConfig = { ...myConfig, ...config };
|
||||
this.config = newConfig;
|
||||
@@ -288,7 +369,7 @@ type AppConfig = {
|
||||
list: any[];
|
||||
};
|
||||
export function parseArgs(args: string[]) {
|
||||
const result: { root?: string; home?: boolean; help?: boolean } = {};
|
||||
const result: { root?: string; home?: boolean; help?: boolean } = { home: true };
|
||||
for (let i = 0; i < args.length; i++) {
|
||||
const arg = args[i];
|
||||
// 处理 root 参数
|
||||
@@ -298,14 +379,13 @@ export function parseArgs(args: string[]) {
|
||||
i++; // 跳过下一个参数,因为它是值
|
||||
}
|
||||
}
|
||||
// 处理 home 参数
|
||||
// if (arg === '--home') {
|
||||
result.home = true;
|
||||
// }
|
||||
if (arg === '--help' || arg === '-h') {
|
||||
result.help = true;
|
||||
}
|
||||
}
|
||||
if (result.root) {
|
||||
result.home = false;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
/**
|
||||
@@ -315,6 +395,7 @@ export function parseArgs(args: string[]) {
|
||||
*/
|
||||
export const parseHomeArg = (homedir?: string) => {
|
||||
const args = process.argv.slice(2);
|
||||
const execPath = process.execPath;
|
||||
const options = parseArgs(args);
|
||||
let _configDir = undefined;
|
||||
if (options.home && homedir) {
|
||||
@@ -322,7 +403,10 @@ export const parseHomeArg = (homedir?: string) => {
|
||||
} else if (options.root) {
|
||||
_configDir = options.root;
|
||||
}
|
||||
const checkUrl = ['.opencode', 'bin/opencode', 'opencode.exe']
|
||||
const isOpencode = checkUrl.some((item) => execPath.includes(item))
|
||||
return {
|
||||
isOpencode,
|
||||
options,
|
||||
configDir: _configDir,
|
||||
};
|
||||
|
||||
@@ -35,7 +35,8 @@ export const checkFileDir = (filePath: string, create = true) => {
|
||||
return exist;
|
||||
};
|
||||
|
||||
export const createDir = (dirPath: string) => {
|
||||
export const createDir = (dirPath: string, isCreate = true) => {
|
||||
if (!isCreate) return dirPath;
|
||||
if (!checkFileExists(dirPath)) {
|
||||
fs.mkdirSync(dirPath, { recursive: true });
|
||||
}
|
||||
|
||||
52
assistant/src/module/assistant/html/login.ts
Normal file
52
assistant/src/module/assistant/html/login.ts
Normal file
@@ -0,0 +1,52 @@
|
||||
export const renderNoAuthAndLogin = (text: string) => {
|
||||
return `<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Login Required</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
background-color: #f4f4f4;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
height: 100vh;
|
||||
margin: 0;
|
||||
}
|
||||
.container {
|
||||
background: white;
|
||||
padding: 20px;
|
||||
border-radius: 5px;
|
||||
box-shadow: 0 2px 10px rgba(0,0,0,0.1);
|
||||
text-align: center;
|
||||
}
|
||||
h1 {
|
||||
color: #333;
|
||||
}
|
||||
p {
|
||||
color: #666;
|
||||
}
|
||||
a {
|
||||
display: inline-block;
|
||||
margin-top: 15px;
|
||||
padding: 10px 15px;
|
||||
background-color: #007BFF;
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
border-radius: 5px;
|
||||
}
|
||||
a:hover {
|
||||
background-color: #0056b3;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
<p>${text}</p>
|
||||
<a href="/root/home">转到首页</a>
|
||||
</div>
|
||||
</body>
|
||||
</html>`;
|
||||
}
|
||||
@@ -1,180 +0,0 @@
|
||||
import { createCert } from '@kevisual/router/sign';
|
||||
import path from 'node:path';
|
||||
import fs from 'node:fs';
|
||||
import { AssistantConfig } from '../config/index.ts';
|
||||
import { checkFileExists } from '../file/index.ts';
|
||||
import { chalk } from '@/module/chalk.ts';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
type Attributes = {
|
||||
name: string;
|
||||
value: string;
|
||||
};
|
||||
type AltNames = {
|
||||
type: number;
|
||||
value?: string;
|
||||
ip?: string;
|
||||
};
|
||||
export class HttpsPem {
|
||||
assistantConfig: AssistantConfig;
|
||||
key: string;
|
||||
cert: string;
|
||||
isHttps = false;
|
||||
constructor(assistantConfig: AssistantConfig) {
|
||||
this.assistantConfig = assistantConfig;
|
||||
this.#initKeyCert();
|
||||
}
|
||||
#initKeyCert() {
|
||||
this.assistantConfig.checkMounted();
|
||||
const config = this.assistantConfig.getConfig();
|
||||
if (config.https) {
|
||||
const httpsType = config.https?.type || 'https';
|
||||
if (httpsType !== 'https') {
|
||||
// console.log(chalk.yellow('当前配置文件 https.type 不是 https, 不使用证书'));
|
||||
return;
|
||||
}
|
||||
this.isHttps = true;
|
||||
if (config.https.keyPath) {
|
||||
const keyPath = config.https.keyPath;
|
||||
const certPath = config.https.certPath;
|
||||
if (checkFileExists(keyPath) && checkFileExists(certPath)) {
|
||||
this.key = fs.readFileSync(keyPath, 'utf-8');
|
||||
this.cert = fs.readFileSync(certPath, 'utf-8');
|
||||
console.log(chalk.green('使用配置文件 https.keyPath 和 https.certPath 的证书'), keyPath, certPath);
|
||||
return;
|
||||
} else {
|
||||
console.log(chalk.red('证书路径不存在,请检查配置文件 https.keyPath 和 https.certPath 是否正确'));
|
||||
}
|
||||
}
|
||||
}
|
||||
if(!this.isHttps) return;
|
||||
const { key, cert } = this.getCert();
|
||||
this.key = key;
|
||||
this.cert = cert;
|
||||
}
|
||||
getPemDir() {
|
||||
const configDir = this.assistantConfig.configPath?.configDir || process.cwd();
|
||||
const pemDir = path.join(configDir, 'pem');
|
||||
if (!checkFileExists(pemDir)) {
|
||||
fs.mkdirSync(pemDir, { recursive: true });
|
||||
}
|
||||
return pemDir;
|
||||
}
|
||||
getCert() {
|
||||
if (!this.assistantConfig.init) return;
|
||||
const pemDir = this.getPemDir();
|
||||
const pemPath = {
|
||||
key: path.join(pemDir, 'https-private-key.pem'),
|
||||
cert: path.join(pemDir, 'https-cert.pem'),
|
||||
config: path.join(pemDir, 'https-config.json'),
|
||||
};
|
||||
const writeCreate = (opts: { key: string; cert: string; data: { createTime: number; expireTime: number } }) => {
|
||||
fs.writeFileSync(pemPath.key, opts.key);
|
||||
fs.writeFileSync(pemPath.cert, opts.cert);
|
||||
fs.writeFileSync(pemPath.config, JSON.stringify(opts.data, null, 2));
|
||||
};
|
||||
if (!checkFileExists(pemPath.key) || !checkFileExists(pemPath.cert)) {
|
||||
const { key, cert, data } = this.createCert();
|
||||
writeCreate({ key, cert, data });
|
||||
console.log(chalk.green('证书创建成功,浏览器需要导入当前证书'));
|
||||
return {
|
||||
key,
|
||||
cert,
|
||||
};
|
||||
}
|
||||
|
||||
if (!checkFileExists(pemPath.config)) {
|
||||
const data = this.createExpireData();
|
||||
fs.writeFileSync(pemPath.config, JSON.stringify(data, null, 2));
|
||||
}
|
||||
const key = fs.readFileSync(pemPath.key, 'utf-8');
|
||||
const cert = fs.readFileSync(pemPath.cert, 'utf-8');
|
||||
const config = fs.readFileSync(pemPath.config, 'utf-8');
|
||||
let expireTime = 0;
|
||||
try {
|
||||
const data = JSON.parse(config);
|
||||
expireTime = data.expireTime;
|
||||
if (typeof expireTime !== 'number') {
|
||||
throw new Error('expireTime is not a number');
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(chalk.red('证书配置文件损坏,重新生成证书'));
|
||||
}
|
||||
const now = new Date().getTime();
|
||||
if (now > expireTime) {
|
||||
this.removeCert();
|
||||
const { key, cert, data } = this.createCert();
|
||||
writeCreate({ key, cert, data });
|
||||
console.log(chalk.green('证书更新成功, 浏览器需要重新导入当前证书'));
|
||||
return {
|
||||
key,
|
||||
cert,
|
||||
};
|
||||
}
|
||||
return {
|
||||
key,
|
||||
cert,
|
||||
};
|
||||
}
|
||||
createExpireData() {
|
||||
const expireTime = new Date().getTime() + 365 * 24 * 60 * 60 * 1000;
|
||||
const expireDate = dayjs(expireTime).format('YYYY-MM-DD HH:mm:ss');
|
||||
return {
|
||||
description: '手动导入证书到浏览器, https-cert.pem文件, 具体使用教程访问 https://kevisual.cn/root/pem-docs/',
|
||||
createTime: new Date().getTime(),
|
||||
expireDate,
|
||||
expireTime,
|
||||
};
|
||||
}
|
||||
/*
|
||||
* 重新生成证书
|
||||
*/
|
||||
removeCert() {
|
||||
const pemDir = this.getPemDir();
|
||||
const pemPath = {
|
||||
key: path.join(pemDir, 'https-private-key.pem'),
|
||||
cert: path.join(pemDir, 'https-cert.pem'),
|
||||
};
|
||||
const oldPath = {
|
||||
key: path.join(pemDir, 'https-private-key.pem.bak'),
|
||||
cert: path.join(pemDir, 'https-cert.pem.bak'),
|
||||
};
|
||||
if (checkFileExists(pemPath.key)) {
|
||||
fs.renameSync(pemPath.key, oldPath.key);
|
||||
}
|
||||
if (checkFileExists(pemPath.cert)) {
|
||||
fs.renameSync(pemPath.cert, oldPath.cert);
|
||||
}
|
||||
}
|
||||
/*
|
||||
* 创建证书
|
||||
* @param attrs 证书属性
|
||||
* @param altNames 证书备用名称
|
||||
*/
|
||||
createCert(attrs?: Attributes[], altNames?: AltNames[]) {
|
||||
const attributes = attrs || [];
|
||||
const altNamesList = altNames || [];
|
||||
const { key, cert } = createCert(
|
||||
[
|
||||
{
|
||||
name: 'commonName',
|
||||
value: 'localhost',
|
||||
},
|
||||
{
|
||||
name: 'organizationName',
|
||||
value: 'kevisual',
|
||||
},
|
||||
...attributes,
|
||||
],
|
||||
altNamesList,
|
||||
);
|
||||
const data = this.createExpireData();
|
||||
return {
|
||||
key,
|
||||
cert,
|
||||
data: {
|
||||
...data,
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -5,9 +5,19 @@ import path from 'node:path';
|
||||
import fs from 'node:fs';
|
||||
import glob from 'fast-glob';
|
||||
import type { App } from '@kevisual/router';
|
||||
import { RemoteApp } from '@/module/remote-app/remote-app.ts';
|
||||
import { logger } from '@/module/logger.ts';
|
||||
import { getEnvToken } from '@/module/http-token.ts';
|
||||
import { initApi } from '@kevisual/api/proxy'
|
||||
import { Query } from '@kevisual/query';
|
||||
import { initLightCode } from '@/module/light-code/index.ts';
|
||||
export class AssistantApp extends Manager {
|
||||
config: AssistantConfig;
|
||||
pagesPath: string;
|
||||
remoteIsConnected = false;
|
||||
attemptedConnectTimes = 0;
|
||||
remoteApp: RemoteApp | null = null;
|
||||
remoteUrl: string | null = null;
|
||||
constructor(config: AssistantConfig, mainApp?: App) {
|
||||
config.checkMounted();
|
||||
const appsPath = config?.configPath?.appsDir || path.join(process.cwd(), 'apps');
|
||||
@@ -65,4 +75,140 @@ export class AssistantApp extends Manager {
|
||||
});
|
||||
return pagesParse;
|
||||
}
|
||||
|
||||
async initRemoteApp(opts?: { token?: string, enabled?: boolean }) {
|
||||
const config = this.config.getConfig();
|
||||
const share = config?.share;
|
||||
const enabled = opts?.enabled ?? share?.enabled ?? false;
|
||||
if (share && enabled !== false) {
|
||||
if (this.remoteApp) {
|
||||
this.remoteApp.ws?.close();
|
||||
this.remoteApp = null;
|
||||
this.remoteIsConnected = false;
|
||||
}
|
||||
const token = config?.token || opts?.token || getEnvToken() as string;
|
||||
const url = new URL(share.url || 'https://kevisual.cn/ws/proxy');
|
||||
const id = config?.app?.id;
|
||||
if (token && url && id) {
|
||||
const remoteApp = new RemoteApp({
|
||||
url: url.toString(),
|
||||
token,
|
||||
id,
|
||||
app: this.mainApp,
|
||||
});
|
||||
const isConnect = await remoteApp.isConnect();
|
||||
if (isConnect) {
|
||||
remoteApp.listenProxy();
|
||||
this.remoteIsConnected = true;
|
||||
// 清理已有的 close 事件监听器,防止多重绑定
|
||||
remoteApp.emitter.removeAllListeners('close');
|
||||
remoteApp.emitter.on('close', () => {
|
||||
setTimeout(() => {
|
||||
if (remoteApp.isError) {
|
||||
console.error('远程应用发生错误,不重连');
|
||||
} else {
|
||||
this.reconnectRemoteApp();
|
||||
}
|
||||
}, 5 * 1000); // 第一次断开5秒后重连
|
||||
});
|
||||
logger.debug('链接到了远程应用服务器');
|
||||
const appId = id;
|
||||
const username = config?.auth.username || 'unknown';
|
||||
const url = new URL(`/${username}/v1/${appId}`, config?.registry || 'https://kevisual.cn/');
|
||||
this.remoteUrl = url.toString();
|
||||
console.log('远程地址', this.remoteUrl);
|
||||
} else {
|
||||
console.log('Not connected to remote app server');
|
||||
}
|
||||
this.remoteApp = remoteApp;
|
||||
} else {
|
||||
if (!token) {
|
||||
logger.error('Token是远程应用连接必须的参数');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
async initRouterApp() {
|
||||
const config = this.config.getConfig();
|
||||
const routerProxy = config?.router?.proxy || [];
|
||||
const base = config.router?.base ?? false;
|
||||
const lightcode = config.router?.lightcode ?? true;
|
||||
if (base) {
|
||||
routerProxy.push({
|
||||
type: 'router',
|
||||
router: {
|
||||
url: `${this.config.getRegistry()}/api/router`,
|
||||
}
|
||||
})
|
||||
}
|
||||
if (lightcode) {
|
||||
routerProxy.push({
|
||||
type: 'lightcode',
|
||||
lightcode: {
|
||||
check: true,
|
||||
}
|
||||
})
|
||||
}
|
||||
if (routerProxy.length === 0) {
|
||||
return
|
||||
}
|
||||
for (const proxyInfo of routerProxy) {
|
||||
if (proxyInfo.type !== 'router' && proxyInfo.type !== 'lightcode') {
|
||||
console.warn('路由的type必须是"router", 或者lightcode');
|
||||
continue;
|
||||
}
|
||||
if (proxyInfo.type === 'lightcode') {
|
||||
initLightCode({
|
||||
router: this.mainApp,
|
||||
config: this.config
|
||||
});
|
||||
continue;
|
||||
}
|
||||
const url = proxyInfo.router!.url;
|
||||
if (!url) {
|
||||
console.warn('路由的api地址不能为空', proxyInfo.router);
|
||||
continue;
|
||||
}
|
||||
const query = new Query({ url });
|
||||
try {
|
||||
initApi({
|
||||
router: this.mainApp,
|
||||
item: {
|
||||
type: 'api',
|
||||
api: {
|
||||
url,
|
||||
query: query as any,
|
||||
}
|
||||
},
|
||||
exclude: "WHERE path = 'auth' OR path = 'router' OR path = 'call'",
|
||||
})
|
||||
console.log('Router API 已初始化', url.toString());
|
||||
} catch (err) {
|
||||
console.error('Router API 初始化失败', url.toString(), err);
|
||||
}
|
||||
}
|
||||
}
|
||||
async reconnectRemoteApp() {
|
||||
console.log('重新连接到远程应用服务器...', this.attemptedConnectTimes);
|
||||
const remoteApp = this.remoteApp;;
|
||||
if (remoteApp) {
|
||||
// 先关闭旧的 WebSocket,防止竞态条件
|
||||
if (remoteApp.ws) {
|
||||
remoteApp.ws.close();
|
||||
}
|
||||
remoteApp.init();
|
||||
this.attemptedConnectTimes += 1;
|
||||
const isConnect = await remoteApp.isConnect();
|
||||
if (isConnect) {
|
||||
remoteApp.listenProxy();
|
||||
this.attemptedConnectTimes = 0;
|
||||
console.log('重新连接到了远程应用服务器');
|
||||
} else {
|
||||
this.reconnectRemoteApp();
|
||||
setTimeout(() => {
|
||||
this.initRouterApp()
|
||||
}, 30 * 1000 + this.attemptedConnectTimes * 10 * 1000); // 30秒后重连 + 每次增加10秒
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,49 +5,39 @@ import path from 'node:path';
|
||||
import { ProxyInfo } from './proxy.ts';
|
||||
import { checkFileExists } from '../file/index.ts';
|
||||
import { log } from '@/module/logger.ts';
|
||||
import { pipeFileStream } from './pipe.ts';
|
||||
import { getContentType } from './module/mime.ts';
|
||||
|
||||
export const fileProxy = (req: http.IncomingMessage, res: http.ServerResponse, proxyApi: ProxyInfo) => {
|
||||
// url开头的文件
|
||||
export const fileProxy2 = (req: http.IncomingMessage, res: http.ServerResponse, proxyApi: ProxyInfo) => {
|
||||
res.statusCode = 501;
|
||||
const url = new URL(req.url, 'http://localhost');
|
||||
const [user, key, _info] = url.pathname.split('/');
|
||||
const pathname = url.pathname.slice(1);
|
||||
const { indexPath = '', target = '', rootPath = process.cwd() } = proxyApi;
|
||||
if (!indexPath) {
|
||||
return res.end('Not Found indexPath');
|
||||
}
|
||||
try {
|
||||
// 检测文件是否存在,如果文件不存在,则返回404
|
||||
let filePath = '';
|
||||
let exist = false;
|
||||
if (_info) {
|
||||
filePath = path.join(rootPath, target, pathname);
|
||||
exist = checkFileExists(filePath, true);
|
||||
}
|
||||
if (!exist) {
|
||||
filePath = path.join(rootPath, target, indexPath);
|
||||
exist = checkFileExists(filePath, true);
|
||||
}
|
||||
log.debug('filePath', { filePath, exist });
|
||||
|
||||
if (!exist) {
|
||||
res.statusCode = 404;
|
||||
res.end('Not Found File');
|
||||
return;
|
||||
}
|
||||
const ext = path.extname(filePath);
|
||||
let maxAge = 24 * 60 * 60 * 1000; // 24小时
|
||||
if (ext === '.html') {
|
||||
maxAge = 0;
|
||||
}
|
||||
let sendFilePath = path.relative(rootPath, filePath);
|
||||
const file = send(req, sendFilePath, {
|
||||
root: rootPath,
|
||||
maxAge,
|
||||
});
|
||||
file.pipe(res);
|
||||
} catch (error) {
|
||||
res.statusCode = 404;
|
||||
res.end('Error:Not Found File');
|
||||
const { rootPath, indexPath = '' } = proxyApi?.file || {}
|
||||
if (!rootPath) {
|
||||
res.end(`系统未配置根路径 rootPath id:[${proxyApi?.file?.id}]`);
|
||||
return;
|
||||
}
|
||||
};
|
||||
const pathname = url.pathname;
|
||||
let targetFilepath = pathname.replace(proxyApi.path || '', '');
|
||||
if (targetFilepath.endsWith('/')) {
|
||||
// 没有指定文件,访问index.html
|
||||
targetFilepath += 'index.html';
|
||||
}
|
||||
const filePath = path.join(rootPath || process.cwd(), targetFilepath);
|
||||
const indexTargetPath = path.join(rootPath || process.cwd(), indexPath);
|
||||
let sendPath = filePath;
|
||||
if (!checkFileExists(filePath)) {
|
||||
res.setHeader('X-Proxy-File', 'false');
|
||||
if (indexPath && checkFileExists(indexTargetPath)) {
|
||||
sendPath = indexTargetPath;
|
||||
} else {
|
||||
res.statusCode = 404;
|
||||
res.end(`文件不存在, 路径: ${filePath}`);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
res.setHeader('X-Proxy-File', 'true');
|
||||
}
|
||||
const contentType = getContentType(sendPath);
|
||||
res.setHeader('Content-Type', contentType);
|
||||
pipeFileStream(sendPath, res);
|
||||
};
|
||||
@@ -2,11 +2,16 @@ import http from 'node:http';
|
||||
import https from 'node:https';
|
||||
import { rewriteCookieDomain } from '../https/cookie-rewrite.ts';
|
||||
import { ProxyInfo } from './proxy.ts';
|
||||
import { pipeProxyReq, pipeProxyRes, pipeStream } from './pipe.ts';
|
||||
export const defaultApiProxy = [
|
||||
{
|
||||
path: '/api/router',
|
||||
target: 'https://kevisual.cn',
|
||||
},
|
||||
{
|
||||
path: '/api/s1',
|
||||
target: 'https://kevisual.cn',
|
||||
},
|
||||
{
|
||||
path: '/v1',
|
||||
target: 'https://kevisual.cn',
|
||||
@@ -18,7 +23,7 @@ export const defaultApiProxy = [
|
||||
* @param paths ['/api/router', '/v1' ]
|
||||
* @returns
|
||||
*/
|
||||
export const createApiProxy = (api: string, paths: string[] = ['/api', '/v1']) => {
|
||||
export const createApiProxy = (api: string, paths: string[] = ['/api', '/v1']): ProxyInfo[] => {
|
||||
const pathList = paths.map((item) => {
|
||||
return {
|
||||
path: item,
|
||||
@@ -81,18 +86,26 @@ export const httpProxy = (req: http.IncomingMessage, res: http.ServerResponse, p
|
||||
// @ts-ignore
|
||||
options.rejectUnauthorized = false; // 忽略证书错误
|
||||
}
|
||||
|
||||
if (res.headersSent) {
|
||||
return;
|
||||
}
|
||||
// 创建代理请求
|
||||
const proxyReq = httpProxy.request(options, (proxyRes) => {
|
||||
// Modify the 'set-cookie' headers using rewriteCookieDomain
|
||||
if (proxyRes.headers['set-cookie']) {
|
||||
proxyRes.headers['set-cookie'] = proxyRes.headers['set-cookie'].map((cookie) => rewriteCookieDomain(cookie, cookieHost));
|
||||
console.log('rewritten set-cookie:', proxyRes.headers['set-cookie']);
|
||||
// 检查响应头是否已经发送
|
||||
if (res.headersSent) {
|
||||
return;
|
||||
}
|
||||
// 复制响应头并修改 'set-cookie'
|
||||
const responseHeaders = { ...proxyRes.headers };
|
||||
if (responseHeaders['set-cookie']) {
|
||||
responseHeaders['set-cookie'] = responseHeaders['set-cookie'].map((cookie) => rewriteCookieDomain(cookie, cookieHost));
|
||||
console.log('rewritten set-cookie:', responseHeaders['set-cookie']);
|
||||
}
|
||||
// 将代理服务器的响应头和状态码返回给客户端
|
||||
res.writeHead(proxyRes.statusCode, proxyRes.headers);
|
||||
res.writeHead(proxyRes.statusCode, responseHeaders);
|
||||
// 将代理响应流写入客户端响应
|
||||
proxyRes.pipe(res, { end: true });
|
||||
// proxyRes.pipe(res, { end: true });
|
||||
pipeProxyRes(proxyRes, res);
|
||||
});
|
||||
// 处理代理请求的错误事件
|
||||
proxyReq.on('error', (err) => {
|
||||
@@ -101,6 +114,8 @@ export const httpProxy = (req: http.IncomingMessage, res: http.ServerResponse, p
|
||||
res.write(`Proxy request error: ${err.message}`);
|
||||
});
|
||||
// 处理 POST 请求的请求体(传递数据到目标服务器),end:true 表示当请求体结束时,关闭请求
|
||||
req.pipe(proxyReq, { end: true });
|
||||
return;
|
||||
};
|
||||
// req.pipe(proxyReq, { end: true });
|
||||
pipeProxyReq(req, proxyReq, res);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
export * from './proxy.ts';
|
||||
export * from './file-proxy.ts';
|
||||
export { default as send } from 'send';
|
||||
export * from './http-proxy.ts';
|
||||
export * from './ws-proxy.ts';
|
||||
export * from './http-proxy.ts';
|
||||
50
assistant/src/module/assistant/proxy/module/mime.ts
Normal file
50
assistant/src/module/assistant/proxy/module/mime.ts
Normal file
@@ -0,0 +1,50 @@
|
||||
import path from 'path';
|
||||
// 获取文件的 content-type
|
||||
export const getContentType = (filePath: string) => {
|
||||
const extname = path.extname(filePath);
|
||||
const contentType = {
|
||||
'.html': 'text/html; charset=utf-8',
|
||||
'.js': 'text/javascript; charset=utf-8',
|
||||
'.mjs': 'text/javascript; charset=utf-8',
|
||||
'.css': 'text/css; charset=utf-8',
|
||||
'.txt': 'text/plain; charset=utf-8',
|
||||
'.json': 'application/json; charset=utf-8',
|
||||
'.png': 'image/png',
|
||||
'.jpg': 'image/jpg',
|
||||
'.gif': 'image/gif',
|
||||
'.svg': 'image/svg+xml',
|
||||
'.wav': 'audio/wav',
|
||||
'.mp4': 'video/mp4',
|
||||
'.md': 'text/markdown; charset=utf-8', // utf-8配置
|
||||
'.ico': 'image/x-icon', // Favicon 图标
|
||||
'.webp': 'image/webp', // WebP 图像格式
|
||||
'.webm': 'video/webm', // WebM 视频格式
|
||||
'.ogg': 'audio/ogg', // Ogg 音频格式
|
||||
'.mp3': 'audio/mpeg', // MP3 音频格式
|
||||
'.m4a': 'audio/mp4', // M4A 音频格式
|
||||
'.m3u8': 'application/vnd.apple.mpegurl', // HLS 播放列表
|
||||
'.ts': 'video/mp2t', // MPEG Transport Stream
|
||||
'.pdf': 'application/pdf', // PDF 文档
|
||||
'.doc': 'application/msword', // Word 文档
|
||||
'.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', // Word 文档 (新版)
|
||||
'.ppt': 'application/vnd.ms-powerpoint', // PowerPoint 演示文稿
|
||||
'.pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation', // PowerPoint (新版)
|
||||
'.xls': 'application/vnd.ms-excel', // Excel 表格
|
||||
'.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', // Excel 表格 (新版)
|
||||
'.csv': 'text/csv; charset=utf-8', // CSV 文件
|
||||
'.xml': 'application/xml; charset=utf-8', // XML 文件
|
||||
'.rtf': 'application/rtf', // RTF 文本文件
|
||||
'.eot': 'application/vnd.ms-fontobject', // Embedded OpenType 字体
|
||||
'.ttf': 'font/ttf', // TrueType 字体
|
||||
'.woff': 'font/woff', // Web Open Font Format 1.0
|
||||
'.woff2': 'font/woff2', // Web Open Font Format 2.0
|
||||
'.otf': 'font/otf', // OpenType 字体
|
||||
'.wasm': 'application/wasm', // WebAssembly 文件
|
||||
'.pem': 'application/x-pem-file', // PEM 证书文件
|
||||
'.crt': 'application/x-x509-ca-cert', // CRT 证书文件
|
||||
'.yaml': 'application/x-yaml; charset=utf-8', // YAML 文件
|
||||
'.yml': 'application/x-yaml; charset=utf-8', // YAML 文件(别名)
|
||||
'.zip': 'application/octet-stream',
|
||||
};
|
||||
return contentType[extname] || 'application/octet-stream';
|
||||
};
|
||||
128
assistant/src/module/assistant/proxy/pipe.ts
Normal file
128
assistant/src/module/assistant/proxy/pipe.ts
Normal file
@@ -0,0 +1,128 @@
|
||||
import * as http from 'http';
|
||||
import * as fs from 'fs';
|
||||
import { isBun } from './utils.ts';
|
||||
import { Readable } from 'stream';
|
||||
import { logger } from '@/module/logger.ts';
|
||||
/**
|
||||
* 文件流管道传输函数
|
||||
* 将指定文件的内容通过流的方式传输给客户端响应
|
||||
* @param filePath 要传输的文件路径
|
||||
* @param res HTTP服务器响应对象
|
||||
*/
|
||||
export const pipeFileStream = (filePath: string, res: http.ServerResponse) => {
|
||||
const readStream = fs.createReadStream(filePath);
|
||||
if (isBun) {
|
||||
// Bun环境下的流处理方式
|
||||
res.pipe(readStream as any);
|
||||
} else {
|
||||
// Node.js标准环境下的流处理方式,end:true表示在流结束时自动关闭响应
|
||||
readStream.pipe(res, { end: true });
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 通用流管道传输函数
|
||||
* 将可读流的数据传输给客户端响应
|
||||
* @param readStream 可读流对象
|
||||
* @param res HTTP服务器响应对象
|
||||
*/
|
||||
export const pipeStream = (readStream: fs.ReadStream | Readable, res: http.ServerResponse) => {
|
||||
if (isBun) {
|
||||
// Bun环境下的流处理方式
|
||||
res.pipe(readStream as any);
|
||||
} else {
|
||||
// Node.js标准环境下的流处理方式
|
||||
readStream.pipe(res, { end: true });
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 代理响应流传输函数
|
||||
* 将代理服务器返回的响应数据传输给客户端
|
||||
* 处理从目标服务器收到的响应流并转发给原始客户端
|
||||
* @param proxyRes 代理服务器的响应对象
|
||||
* @param res HTTP服务器响应对象
|
||||
*/
|
||||
export const pipeProxyRes = (proxyRes: http.IncomingMessage, res: http.ServerResponse) => {
|
||||
if (isBun) {
|
||||
// Bun环境下需要手动收集数据并end,因为Bun的pipe机制与Node.js不同
|
||||
const chunks: Buffer[] = [];
|
||||
// 监听数据到达事件,收集所有数据块
|
||||
proxyRes.on('data', (chunk: Buffer) => {
|
||||
chunks.push(chunk);
|
||||
});
|
||||
if (proxyRes.url === '/api/router') {
|
||||
console.log(proxyRes.url, proxyRes.statusCode);
|
||||
}
|
||||
// 监听数据结束事件,将收集的数据合并并发送给客户端
|
||||
proxyRes.on('end', () => {
|
||||
const result = Buffer.concat(chunks).toString();
|
||||
res.end(result);
|
||||
});
|
||||
|
||||
// 监听错误事件,处理代理响应过程中的错误
|
||||
proxyRes.on('error', (error) => {
|
||||
res.writeHead(500);
|
||||
res.end(JSON.stringify({ error: error.message }));
|
||||
});
|
||||
|
||||
} else {
|
||||
// Node.js标准环境下直接使用pipe进行流传输
|
||||
proxyRes.pipe(res, { end: true });
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 代理请求流传输函数
|
||||
* 将客户端的请求数据传输给代理服务器
|
||||
* 处理来自客户端的请求流并转发给目标服务器
|
||||
* @param req 客户端的请求对象
|
||||
* @param proxyReq 代理服务器的请求对象
|
||||
*/
|
||||
export const pipeProxyReq = async (req: http.IncomingMessage, proxyReq: http.ClientRequest, res: any) => {
|
||||
if (isBun) {
|
||||
try {
|
||||
// @ts-ignore
|
||||
const bunRequest = req.bun.request;
|
||||
const contentType = req.headers['content-type'] || '';
|
||||
if (contentType.includes('multipart/form-data')) {
|
||||
console.log('Processing multipart/form-data');
|
||||
const arrayBuffer = await bunRequest.arrayBuffer();
|
||||
|
||||
// 设置请求头(在写入数据之前)
|
||||
proxyReq.setHeader('content-type', contentType);
|
||||
proxyReq.setHeader('content-length', arrayBuffer.byteLength.toString());
|
||||
|
||||
// 写入数据并结束请求
|
||||
if (arrayBuffer.byteLength > 0) {
|
||||
proxyReq.write(Buffer.from(arrayBuffer));
|
||||
}
|
||||
proxyReq.end();
|
||||
return;
|
||||
}
|
||||
logger.debug('Bun pipeProxyReq content-type', contentType);
|
||||
// @ts-ignore
|
||||
const bodyString = req.body;
|
||||
bodyString && proxyReq.write(bodyString);
|
||||
proxyReq.end();
|
||||
} catch (error) {
|
||||
proxyReq.destroy(error);
|
||||
}
|
||||
} else {
|
||||
// Node.js标准环境下直接使用pipe进行流传输
|
||||
req.pipe(proxyReq, { end: true });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export const pipeBusboy = async (req: http.IncomingMessage, res: http.ServerResponse, busboy: any) => {
|
||||
if (isBun) {
|
||||
// @ts-ignore
|
||||
const bunRequest = req.bun.request;
|
||||
const arrayBuffer = await bunRequest.arrayBuffer();
|
||||
const buffer = Buffer.from(arrayBuffer);
|
||||
busboy.end(buffer);
|
||||
} else {
|
||||
req.pipe(busboy);
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,20 @@
|
||||
import http from 'node:http';
|
||||
import { httpProxy } from './http-proxy.ts';
|
||||
import { s3Proxy } from './s3.ts';
|
||||
import { fileProxy2 } from './file-proxy.ts';
|
||||
export type ProxyInfo = {
|
||||
/**
|
||||
* 代理路径, 比如/root/center, 匹配的路径
|
||||
* 代理路径, 比如/root/home, 匹配的路径
|
||||
*/
|
||||
path?: string;
|
||||
/**
|
||||
* 目标地址
|
||||
* 目标url地址,比如http://localhost:3000
|
||||
*/
|
||||
target?: string;
|
||||
/**
|
||||
* 类型
|
||||
*/
|
||||
type?: 'file' | 'dynamic' | 'minio' | 'http';
|
||||
type?: 'file' | 'dynamic' | 'minio' | 'http' | 's3' | 'router' | 'lightcode';
|
||||
/**
|
||||
* 目标的 pathname, 默认为请求的url.pathname, 设置了pathname,则会使用pathname作为请求的url.pathname
|
||||
* @default undefined
|
||||
@@ -22,39 +26,44 @@ export type ProxyInfo = {
|
||||
* @default false
|
||||
*/
|
||||
ws?: boolean;
|
||||
/**
|
||||
* 首要文件,比如index.html, type为fileProxy代理有用 设置了首要文件,如果文件不存在,则访问首要文件
|
||||
*/
|
||||
indexPath?: string;
|
||||
/**
|
||||
* 根路径, 默认是process.cwd(), type为fileProxy代理有用,必须为绝对路径
|
||||
*/
|
||||
rootPath?: string;
|
||||
s3?: {
|
||||
/**
|
||||
* 如何id存在,使用assistan-config的storage配置
|
||||
*/
|
||||
id?: string;
|
||||
bucket?: string;
|
||||
region?: string;
|
||||
accessKeyId?: string;
|
||||
secretAccessKey?: string;
|
||||
endpoint?: string;
|
||||
},
|
||||
file?: {
|
||||
id?: string;
|
||||
indexPath?: string;
|
||||
rootPath?: string;
|
||||
},
|
||||
router?: {
|
||||
id?: string;
|
||||
url?: string;
|
||||
},
|
||||
lightcode?: {
|
||||
id?: string;
|
||||
/**
|
||||
* 是否检测远程服务更新
|
||||
*/
|
||||
check?: boolean;
|
||||
}
|
||||
};
|
||||
|
||||
export type ApiList = {
|
||||
path: string;
|
||||
/**
|
||||
* url或者相对路径
|
||||
*/
|
||||
target: string;
|
||||
/**
|
||||
* 目标地址
|
||||
*/
|
||||
ws?: boolean;
|
||||
/**
|
||||
* 类型
|
||||
*/
|
||||
type?: 'static' | 'dynamic' | 'minio';
|
||||
}[];
|
||||
|
||||
/**
|
||||
|
||||
[
|
||||
{
|
||||
path: '/api/v1/user',
|
||||
target: 'http://localhost:3000/api/v1/user',
|
||||
type: 'dynamic',
|
||||
},
|
||||
]
|
||||
*/
|
||||
export const proxy = (req: http.IncomingMessage, res: http.ServerResponse, proxyApi: ProxyInfo) => {
|
||||
if (proxyApi.type === 'http' || !proxyApi.type) {
|
||||
return httpProxy(req, res, proxyApi);
|
||||
}
|
||||
console.log('proxyApi', proxyApi);
|
||||
if (proxyApi.type === 's3') {
|
||||
return s3Proxy(req, res, proxyApi);
|
||||
}
|
||||
if (proxyApi.type === 'file') {
|
||||
return fileProxy2(req, res, proxyApi);
|
||||
}
|
||||
}
|
||||
79
assistant/src/module/assistant/proxy/s3.ts
Normal file
79
assistant/src/module/assistant/proxy/s3.ts
Normal file
@@ -0,0 +1,79 @@
|
||||
import { S3Client } from '@aws-sdk/client-s3';
|
||||
import { ProxyInfo } from './proxy.ts';
|
||||
import http from 'http';
|
||||
import { OssBase } from '@kevisual/oss/s3.ts';
|
||||
import { pipeStream } from './pipe.ts';
|
||||
import { Readable } from 'stream';
|
||||
const mapS3 = new Map<string, S3Client>();
|
||||
|
||||
export const s3Proxy = async (req: http.IncomingMessage, res: http.ServerResponse, proxyApi: ProxyInfo) => {
|
||||
const s3 = proxyApi.s3;
|
||||
if (!s3) {
|
||||
res.statusCode = 500;
|
||||
res.end('S3 config not found');
|
||||
return;
|
||||
}
|
||||
let findClient = mapS3.get(s3.accessKeyId);
|
||||
let s3Client: S3Client;
|
||||
if (findClient) {
|
||||
s3Client = findClient;
|
||||
} else {
|
||||
s3Client = new S3Client({
|
||||
credentials: {
|
||||
accessKeyId: s3.accessKeyId,
|
||||
secretAccessKey: s3.secretAccessKey,
|
||||
},
|
||||
region: s3.region,
|
||||
endpoint: s3.endpoint,
|
||||
});
|
||||
mapS3.set(s3.accessKeyId, s3Client);
|
||||
}
|
||||
const oss = new OssBase({
|
||||
client: s3Client!,
|
||||
bucketName: s3.bucket,
|
||||
});
|
||||
|
||||
const requestUrl = new URL(req.url, 'http://localhost');
|
||||
const proxyPath = proxyApi.path || '';
|
||||
let objectPath = requestUrl.pathname.replace(proxyPath + '/', '');
|
||||
if (objectPath.startsWith(s3.bucket + '/')) {
|
||||
objectPath = objectPath.replace(s3.bucket + '/', '');
|
||||
}
|
||||
if (objectPath.endsWith('/')) {
|
||||
// 获取目录列表
|
||||
res.statusCode = 200;
|
||||
res.setHeader('Content-Type', 'application/json; charset=utf-8');
|
||||
const list = await oss.listObjects(objectPath);
|
||||
res.end(JSON.stringify(list, null, 2));
|
||||
return;
|
||||
}
|
||||
oss.getObject(objectPath).then((response) => {
|
||||
if (!response.Body) {
|
||||
res.statusCode = 404;
|
||||
res.end('Object not found');
|
||||
return;
|
||||
}
|
||||
// 设置响应头
|
||||
if (response.ContentType) {
|
||||
res.setHeader('Content-Type', response.ContentType);
|
||||
}
|
||||
if (response.ContentLength) {
|
||||
res.setHeader('Content-Length', response.ContentLength);
|
||||
}
|
||||
if (response.LastModified) {
|
||||
res.setHeader('Last-Modified', response.LastModified.toUTCString());
|
||||
}
|
||||
if (response.ETag) {
|
||||
res.setHeader('ETag', response.ETag);
|
||||
}
|
||||
|
||||
// response.Body 已经是 Readable 流,直接 pipe 到 res
|
||||
// (response.Body as Readable).pipe(res);
|
||||
pipeStream(response.Body as Readable, res);
|
||||
}).catch((err) => {
|
||||
console.error('S3 getObject error:', err);
|
||||
res.statusCode = 500;
|
||||
res.end(`S3 error: ${err.message}`);
|
||||
});
|
||||
return;
|
||||
}
|
||||
6
assistant/src/module/assistant/proxy/utils.ts
Normal file
6
assistant/src/module/assistant/proxy/utils.ts
Normal file
@@ -0,0 +1,6 @@
|
||||
export const isBun = typeof Bun !== 'undefined' && Bun?.version != null;
|
||||
|
||||
export const isNode = typeof process !== 'undefined' && process?.versions != null && process.versions?.node != null;
|
||||
|
||||
// @ts-ignore
|
||||
export const isDeno = typeof Deno !== 'undefined' && Deno?.version != null && Deno?.version?.deno != null;
|
||||
@@ -4,6 +4,7 @@ import type { Http2Server } from 'node:http2';
|
||||
import { WebSocket } from 'ws';
|
||||
import { ProxyInfo } from './proxy.ts';
|
||||
import { WebSocketServer } from 'ws';
|
||||
import { isBun, isNode } from './utils.ts';
|
||||
|
||||
export const wss = new WebSocketServer({
|
||||
noServer: true,
|
||||
@@ -97,7 +98,13 @@ export const wsProxy = (server: HttpServer | HttpsServer | Http2Server, config:
|
||||
await wssApp.handleConnection(ws, req);
|
||||
});
|
||||
// 处理升级请求
|
||||
server.on('upgrade', (request, socket, head) => {
|
||||
wssApp.upgrade(request, socket, head);
|
||||
});
|
||||
if (!isBun) {
|
||||
server.on('upgrade', (request, socket, head) => {
|
||||
wssApp.upgrade(request, socket, head);
|
||||
});
|
||||
} else if (isBun) {
|
||||
// @ts-ignore
|
||||
console.warn('Bun WebSocket proxy is not implemented yet.');
|
||||
console.log('server', server)
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,138 +0,0 @@
|
||||
import type { AssistantConfig } from '@/module/assistant/index.ts';
|
||||
import { WebSocket } from 'ws';
|
||||
import type { App } from '@kevisual/router';
|
||||
import { EventEmitter } from 'eventemitter3';
|
||||
import { logger } from '@/module/logger.ts';
|
||||
type RemoteAppOptions = {
|
||||
app?: App;
|
||||
assistantConfig?: AssistantConfig;
|
||||
emitter?: EventEmitter;
|
||||
};
|
||||
export class RemoteApp {
|
||||
mainApp: App;
|
||||
assistantConfig: AssistantConfig;
|
||||
url: string;
|
||||
name: string;
|
||||
enabled: boolean;
|
||||
emitter: EventEmitter;
|
||||
isConnected: boolean;
|
||||
ws: WebSocket;
|
||||
constructor(opts?: RemoteAppOptions) {
|
||||
this.mainApp = opts?.app;
|
||||
this.assistantConfig = opts?.assistantConfig;
|
||||
const share = this.assistantConfig?.getConfig()?.share;
|
||||
this.emitter = opts?.emitter || new EventEmitter();
|
||||
if (share) {
|
||||
const { url, name, enabled } = share;
|
||||
this.url = url;
|
||||
this.name = name;
|
||||
this.enabled = enabled ?? false;
|
||||
if (this.enabled) {
|
||||
this.init();
|
||||
}
|
||||
}
|
||||
}
|
||||
async isConnect(): Promise<boolean> {
|
||||
const that = this;
|
||||
if (this.isConnected) {
|
||||
return true;
|
||||
}
|
||||
if (!this.enabled) {
|
||||
return false;
|
||||
}
|
||||
return new Promise((resolve) => {
|
||||
const timeout = setTimeout(() => {
|
||||
resolve(false);
|
||||
that.emitter.off('open', listenOnce);
|
||||
}, 5000);
|
||||
const listenOnce = () => {
|
||||
clearTimeout(timeout);
|
||||
that.isConnected = true;
|
||||
resolve(true);
|
||||
};
|
||||
that.emitter.once('open', listenOnce);
|
||||
});
|
||||
}
|
||||
getWsURL(url: string) {
|
||||
const { protocol } = new URL(url);
|
||||
const wsProtocol = protocol === 'https:' ? 'wss:' : 'ws:';
|
||||
const wsURL = url.toString().replace(protocol, wsProtocol);
|
||||
return wsURL;
|
||||
}
|
||||
async init() {
|
||||
if (!this.url) {
|
||||
throw new Error('No url provided for remote app');
|
||||
}
|
||||
if (!this.name) {
|
||||
throw new Error('No name provided for remote app');
|
||||
}
|
||||
console.log('Connecting to remote app:', this.name, this.url, this.getWsURL(this.url));
|
||||
const ws = new WebSocket(this.getWsURL(this.url), {
|
||||
rejectUnauthorized: true,
|
||||
});
|
||||
const that = this;
|
||||
ws.on('open', that.onOpen.bind(that));
|
||||
ws.on('close', that.onClose.bind(that));
|
||||
ws.on('message', that.onMessage.bind(that));
|
||||
ws.on('error', that.onError.bind(that));
|
||||
this.ws = ws;
|
||||
}
|
||||
onOpen() {
|
||||
this.emitter.emit('open', this.name);
|
||||
}
|
||||
onClose() {
|
||||
this.emitter.emit('close', this.name);
|
||||
}
|
||||
onMessage(data: any) {
|
||||
this.emitter.emit('message', data);
|
||||
}
|
||||
onError(error: any) {
|
||||
console.error('Error in remote app:', this.name, error);
|
||||
this.emitter.emit('error', error);
|
||||
}
|
||||
on(event: 'open' | 'close' | 'message' | 'error', listener: (data: any) => void) {
|
||||
this.emitter.on(event, listener);
|
||||
return () => {
|
||||
this.emitter.off(event, listener);
|
||||
};
|
||||
}
|
||||
|
||||
sendData(data: any) {}
|
||||
json(data: any) {
|
||||
this.ws.send(JSON.stringify(data));
|
||||
}
|
||||
listenProxy() {
|
||||
const remoteApp = this;
|
||||
const app = this.mainApp;
|
||||
const listenFn = async (event: any) => {
|
||||
const data = event.toString();
|
||||
logger.debug('Received message:', data);
|
||||
const body = JSON.parse(data);
|
||||
const message = body.data || {};
|
||||
if (body?.type !== 'proxy') return;
|
||||
if (!body.id) {
|
||||
remoteApp.json({
|
||||
id: body.id,
|
||||
data: {
|
||||
code: 400,
|
||||
message: 'id is required',
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
const res = await app.call(message);
|
||||
remoteApp.json({
|
||||
id: body.id,
|
||||
data: {
|
||||
code: res.code,
|
||||
data: res.body,
|
||||
message: res.message,
|
||||
},
|
||||
});
|
||||
};
|
||||
remoteApp.emitter.on('message', listenFn);
|
||||
return () => {
|
||||
remoteApp.emitter.off('message', listenFn);
|
||||
};
|
||||
}
|
||||
}
|
||||
16
assistant/src/module/file-hash.ts
Normal file
16
assistant/src/module/file-hash.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import crypto from 'node:crypto';
|
||||
import fs from 'node:fs';
|
||||
|
||||
export const getHash = (file: string) => {
|
||||
if (!fs.existsSync(file)) return '';
|
||||
const buffer = fs.readFileSync(file); // 不指定编码,返回 Buffer
|
||||
return crypto.createHash('md5').update(buffer).digest('hex');
|
||||
};
|
||||
|
||||
export const getBufferHash = (buffer: Buffer) => {
|
||||
return crypto.createHash('md5').update(buffer).digest('hex');
|
||||
};
|
||||
|
||||
export const getStringHash = (str: string) => {
|
||||
return crypto.createHash('md5').update(str).digest('hex');
|
||||
}
|
||||
22
assistant/src/module/get-header-token.ts
Normal file
22
assistant/src/module/get-header-token.ts
Normal file
@@ -0,0 +1,22 @@
|
||||
import http from 'http';
|
||||
import * as cookie from '@kevisual/router/src/server/cookie.ts';
|
||||
|
||||
export const getTokenFromRequest = (req: http.IncomingMessage) => {
|
||||
let token = (req.headers?.['authorization'] as string) || (req.headers?.['Authorization'] as string) || '';
|
||||
const url = new URL(req.url || '', 'http://localhost');
|
||||
if (!token) {
|
||||
token = url.searchParams.get('token') || '';
|
||||
}
|
||||
if (!token) {
|
||||
const parsedCookies = cookie.parse(req.headers.cookie || '');
|
||||
token = parsedCookies.token || '';
|
||||
}
|
||||
if (token) {
|
||||
token = token.replace('Bearer ', '');
|
||||
}
|
||||
return token;
|
||||
}
|
||||
|
||||
export const getTokenFromContext = (ctx: any) => {
|
||||
return ctx.query.token;
|
||||
}
|
||||
39
assistant/src/module/http-token.ts
Normal file
39
assistant/src/module/http-token.ts
Normal file
@@ -0,0 +1,39 @@
|
||||
import { useKey } from '@kevisual/use-config';
|
||||
import http from 'node:http';
|
||||
export const error = (msg: string, code = 500) => {
|
||||
return JSON.stringify({ code, message: msg });
|
||||
};
|
||||
const cookie = {
|
||||
parse: (cookieStr: string) => {
|
||||
const cookies: Record<string, string> = {};
|
||||
const cookiePairs = cookieStr.split(';');
|
||||
for (const pair of cookiePairs) {
|
||||
const [key, value] = pair.split('=').map((v) => v.trim());
|
||||
if (key && value) {
|
||||
cookies[key] = decodeURIComponent(value);
|
||||
}
|
||||
}
|
||||
return cookies;
|
||||
}
|
||||
}
|
||||
export const getToken = async (req: http.IncomingMessage) => {
|
||||
let token = (req.headers?.['authorization'] as string) || (req.headers?.['Authorization'] as string) || '';
|
||||
const url = new URL(req.url || '', 'http://localhost');
|
||||
if (!token) {
|
||||
token = url.searchParams.get('token') || '';
|
||||
}
|
||||
if (!token) {
|
||||
const parsedCookies = cookie.parse(req.headers.cookie || '');
|
||||
token = parsedCookies.token || '';
|
||||
}
|
||||
if (token) {
|
||||
token = token.replace('Bearer ', '');
|
||||
}
|
||||
|
||||
return { token };
|
||||
};
|
||||
|
||||
export const getEnvToken = () => {
|
||||
const envTokne = useKey('KEVISUAL_TOKEN') || '';
|
||||
return envTokne;
|
||||
}
|
||||
177
assistant/src/module/light-code/index.ts
Normal file
177
assistant/src/module/light-code/index.ts
Normal file
@@ -0,0 +1,177 @@
|
||||
import { App, QueryRouterServer } from '@kevisual/router';
|
||||
import { AssistantInit } from '../../services/init/index.ts';
|
||||
import path from 'node:path';
|
||||
import fs, { write } from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import glob from 'fast-glob';
|
||||
import { runCode } from './run.ts';
|
||||
const codeDemoId = '0e700dc8-90dd-41b7-91dd-336ea51de3d2'
|
||||
import { filter } from "@kevisual/js-filter";
|
||||
import { getHash, getStringHash } from '../file-hash.ts';
|
||||
import { AssistantConfig } from '@/lib.ts';
|
||||
|
||||
const codeDemo = `// 这是一个示例代码文件
|
||||
import {App} from '@kevisual/router';
|
||||
|
||||
const app = new App();
|
||||
|
||||
app.route({
|
||||
path: 'hello',
|
||||
description: 'LightCode 示例路由',
|
||||
metadata: {
|
||||
tags: ['light-code', 'example'],
|
||||
},
|
||||
}).define(async (ctx) => {
|
||||
console.log('tokenUser:', ctx.query?.tokenUser);
|
||||
ctx.body = 'Hello from LightCode!';
|
||||
}).addTo(app);
|
||||
|
||||
app.wait();
|
||||
`;
|
||||
const writeCodeDemo = async (appDir: string) => {
|
||||
const lightcodeDir = path.join(appDir, 'light-code', 'code');
|
||||
const demoPath = path.join(lightcodeDir, `${codeDemoId}.ts`);
|
||||
fs.writeFileSync(demoPath, codeDemo, 'utf-8');
|
||||
}
|
||||
// writeCodeDemo(path.join(os.homedir(), 'kevisual', 'assistant-app', 'apps'));
|
||||
|
||||
type opts = {
|
||||
router: QueryRouterServer | App
|
||||
config: AssistantConfig | AssistantInit
|
||||
sync?: boolean
|
||||
}
|
||||
type LightCodeFile = {
|
||||
id?: string, code?: string, hash?: string, filepath: string
|
||||
}
|
||||
export const initLightCode = async (opts: opts) => {
|
||||
// 注册 light-code 路由
|
||||
console.log('初始化 light-code 路由');
|
||||
const config = opts.config as AssistantInit;
|
||||
const app = opts.router;
|
||||
const token = config.getConfig()?.token || '';
|
||||
const query = config.query;
|
||||
const sync = opts.sync ?? true;
|
||||
if (!config || !app) {
|
||||
console.error('initLightCode 缺少必要参数, config 或 app');
|
||||
return;
|
||||
}
|
||||
const appDir = config.configPath.appsDir;
|
||||
const lightcodeDir = path.join(appDir, 'light-code', 'code');
|
||||
if (!fs.existsSync(lightcodeDir)) {
|
||||
fs.mkdirSync(lightcodeDir, { recursive: true });
|
||||
}
|
||||
let diffList: LightCodeFile[] = [];
|
||||
|
||||
const codeFiles = glob.sync(['**/*.ts', '**/*.js'], {
|
||||
cwd: lightcodeDir,
|
||||
onlyFiles: true,
|
||||
}).map(file => {
|
||||
return {
|
||||
filepath: path.join(lightcodeDir, file),
|
||||
// hash: getHash(path.join(lightcodeDir, file))
|
||||
}
|
||||
});
|
||||
|
||||
if (sync) {
|
||||
const queryRes = await query.post({
|
||||
path: 'light-code',
|
||||
key: 'list',
|
||||
token,
|
||||
});
|
||||
if (queryRes.code === 200) {
|
||||
const lightQueryList = queryRes.data?.list || [];
|
||||
for (const item of lightQueryList) {
|
||||
const codeHash = getStringHash(item.code || '');
|
||||
diffList.push({ id: item.id!, code: item.code || '', hash: codeHash, filepath: path.join(lightcodeDir, `${item.id}.ts`) });
|
||||
}
|
||||
|
||||
|
||||
const codeFileSet = new Set(codeFiles.map(f => f.filepath));
|
||||
// 需要新增的文件 (在 diffList 中但不在 codeFiles 中)
|
||||
const toAdd = diffList.filter(d => !codeFileSet.has(d.filepath));
|
||||
// 需要删除的文件 (在 codeFiles 中但不在 diffList 中)
|
||||
const toDelete = codeFiles.filter(f => !diffList.some(d => d.filepath === f.filepath));
|
||||
// 需要更新的文件 (两边都有但 hash 不同)
|
||||
const toUpdate = diffList.filter(d => codeFileSet.has(d.filepath) && d.hash !== getHash(d.filepath));
|
||||
const unchanged = diffList.filter(d => codeFileSet.has(d.filepath) && d.hash === getHash(d.filepath));
|
||||
|
||||
// 执行新增
|
||||
for (const item of toAdd) {
|
||||
fs.writeFileSync(item.filepath, item.code, 'utf-8');
|
||||
// console.log(`新增 light-code 文件: ${item.filepath}`);
|
||||
}
|
||||
|
||||
// 执行删除
|
||||
for (const filepath of toDelete) {
|
||||
fs.unlinkSync(filepath.filepath);
|
||||
// console.log(`删除 light-code 文件: ${filepath.filepath}`);
|
||||
}
|
||||
|
||||
// 执行更新
|
||||
for (const item of toUpdate) {
|
||||
fs.writeFileSync(item.filepath, item.code, 'utf-8');
|
||||
// console.log(`更新 light-code 文件: ${item.filepath}`);
|
||||
}
|
||||
// 记录未更新的文件
|
||||
// const lightCodeList = [...toAdd, ...unchanged].map(d => ({
|
||||
// filepath: d.filepath,
|
||||
// hash: d.hash
|
||||
// }));
|
||||
} else {
|
||||
console.error('light-code 同步失败', queryRes.message);
|
||||
diffList = codeFiles;
|
||||
}
|
||||
} else {
|
||||
diffList = codeFiles;
|
||||
}
|
||||
|
||||
|
||||
for (const file of diffList) {
|
||||
const tsPath = file.filepath;
|
||||
const runRes = await runCode(tsPath, { path: 'router', key: 'list' }, { timeout: 10000 });
|
||||
if (runRes.success) {
|
||||
const res = runRes.data;
|
||||
if (res.code === 200) {
|
||||
const list = res.data?.list || [];
|
||||
for (const routerItem of list) {
|
||||
if (routerItem.path?.includes('auth') || routerItem.path?.includes('router') || routerItem.path?.includes('call')) {
|
||||
continue;
|
||||
}
|
||||
// console.log(`注册 light-code 路由: [${routerItem.path}] ${routerItem.id} 来自文件: ${file.filepath}`);
|
||||
const metadata = routerItem.metadata || {};
|
||||
if (metadata.tags && Array.isArray(metadata.tags)) {
|
||||
metadata.tags.push('light-code');
|
||||
} else {
|
||||
metadata.tags = ['light-code'];
|
||||
}
|
||||
app.route({
|
||||
id: routerItem.id,
|
||||
path: `${routerItem.id}__${routerItem.path}`,
|
||||
key: routerItem.key,
|
||||
description: routerItem.description || '',
|
||||
metadata,
|
||||
middleware: ['auth'],
|
||||
}).define(async (ctx) => {
|
||||
const tokenUser = ctx.state?.tokenUser || {};
|
||||
const query = { ...ctx.query, tokenUser }
|
||||
const runRes2 = await runCode(tsPath, query, { timeout: 30000 });
|
||||
if (runRes2.success) {
|
||||
const res2 = runRes2.data;
|
||||
if (res2.code === 200) {
|
||||
ctx.body = res2.data;
|
||||
} else {
|
||||
ctx.throw(res2.code, res2.message || 'Lightcode 路由执行失败');
|
||||
}
|
||||
} else {
|
||||
ctx.throw(runRes2.error || 'Lightcode 路由执行失败');
|
||||
}
|
||||
}).addTo(app);
|
||||
|
||||
}
|
||||
}
|
||||
} else {
|
||||
console.error('light-code 路由执行失败', runRes.error);
|
||||
}
|
||||
}
|
||||
console.log(`light-code 路由注册成功`, `注册${diffList.length}个路由`);
|
||||
}
|
||||
@@ -32,7 +32,7 @@ type RunCode = {
|
||||
};
|
||||
error?: any
|
||||
timestamp?: string
|
||||
[key: string]: any
|
||||
output?: string
|
||||
}
|
||||
export const runCode = async (tsPath: string, params: RunCodeParams = {}, opts?: RunCodeOptions): Promise<RunCode> => {
|
||||
return new Promise((resolve, reject) => {
|
||||
@@ -43,7 +43,7 @@ export const runCode = async (tsPath: string, params: RunCodeParams = {}, opts?:
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
let output = ''
|
||||
const timeoutMs = opts?.timeout || 30000; // 默认30秒超时
|
||||
|
||||
let child
|
||||
@@ -70,6 +70,7 @@ export const runCode = async (tsPath: string, params: RunCodeParams = {}, opts?:
|
||||
if (!resolved) {
|
||||
resolved = true
|
||||
cleanup()
|
||||
result.output = output
|
||||
resolve(result)
|
||||
}
|
||||
}
|
||||
@@ -77,7 +78,11 @@ export const runCode = async (tsPath: string, params: RunCodeParams = {}, opts?:
|
||||
try {
|
||||
// 使用 Bun 的 fork 模式启动子进程
|
||||
child = fork(tsPath, [], {
|
||||
silent: true // 启用 stdio 重定向
|
||||
silent: true, // 启用 stdio 重定向
|
||||
env: {
|
||||
...process.env,
|
||||
BUN_CHILD_PROCESS: 'true' // 标记为子进程
|
||||
}
|
||||
})
|
||||
// 监听来自子进程的消息
|
||||
child.on('message', (msg: RunCode) => {
|
||||
@@ -94,6 +99,11 @@ export const runCode = async (tsPath: string, params: RunCodeParams = {}, opts?:
|
||||
})
|
||||
})
|
||||
}
|
||||
if (child.stdout) {
|
||||
child.stdout.on('data', (data) => {
|
||||
output += data.toString()
|
||||
})
|
||||
}
|
||||
|
||||
// 监听子进程退出事件
|
||||
child.on('exit', (code, signal) => {
|
||||
|
||||
@@ -40,7 +40,3 @@ if (DEV_SERVER) {
|
||||
});
|
||||
loadManager({ configFilename: 'b.json' });
|
||||
}
|
||||
|
||||
export const loadApp = (mainApp: App, appInfo?: any) => {
|
||||
//
|
||||
};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { App } from '@kevisual/router';
|
||||
import { loadAppInfo, AppInfoConfig, saveAppInfo, getAppsPath } from './app-file.ts';
|
||||
import { fork } from 'node:child_process';
|
||||
import { merge } from 'lodash-es';
|
||||
import { merge } from 'es-toolkit';
|
||||
import { deleteFileAppInfo } from './app-file.ts';
|
||||
import { fileIsExist } from '@kevisual/use-config/env';
|
||||
import path from 'node:path';
|
||||
@@ -53,6 +53,7 @@ export type AppInfo = {
|
||||
path?: string; // 文件路径
|
||||
env?: Record<string, any>; // 环境变量
|
||||
engine?: string; // runtime, python node deno bun etc
|
||||
init?: boolean; // 是否需要初始化安装npm等依赖
|
||||
/**
|
||||
* pm2 选项, 仅仅当是AppType.Pm2SystemApp的时候生效
|
||||
* pm2 选项可以参考 https://pm2.keymetrics.io/docs/usage/application-declaration/
|
||||
@@ -125,71 +126,7 @@ export class Manager<T extends AppInfo = AppInfo> {
|
||||
async loadApp(app: T) {
|
||||
const mainApp = this.mainApp;
|
||||
this.apps.set(app.key, app);
|
||||
if (app.status !== 'running') {
|
||||
return;
|
||||
}
|
||||
if (!fileIsExist(app.path)) {
|
||||
console.error('app is not found');
|
||||
return;
|
||||
}
|
||||
const pathEntry = path.join(app.path, app.entry);
|
||||
if (!fileIsExist(pathEntry)) {
|
||||
console.error('file entry not found');
|
||||
return;
|
||||
}
|
||||
const entry = app.entry + `?timestamp=${app?.timestamp}`;
|
||||
// 注册路由
|
||||
if (app.type === AppType.MicroApp) {
|
||||
const childProcess = fork(app.entry, [], {
|
||||
stdio: 'inherit', // 共享主进程的标准输入输出
|
||||
cwd: app.path,
|
||||
env: {
|
||||
...process.env,
|
||||
...app.env,
|
||||
APP_KEY: app.key,
|
||||
APP_PATH: app.path,
|
||||
APP_ENTRY: entry
|
||||
}
|
||||
});
|
||||
app.process = childProcess;
|
||||
} else if (app.type === AppType.SystemApp) {
|
||||
const pathEntryAndTimestamp = path.join(app.path, entry);
|
||||
// Windows下需要使用file://协议,并将反斜杠转换为正斜杠
|
||||
const importPath = process.platform === 'win32'
|
||||
? 'file:///' + pathEntryAndTimestamp.replace(/\\/g, '/')
|
||||
: pathEntryAndTimestamp;
|
||||
const module = await import(importPath);
|
||||
if (module.loadApp && mainApp) {
|
||||
await module.loadApp?.(mainApp, app);
|
||||
}
|
||||
} else if (app.type === AppType.GatewayApp) {
|
||||
console.log('gateway app not support');
|
||||
} else if (app.type === AppType.Pm2SystemApp) {
|
||||
const pathEntry = path.join(app.path, app.entry);
|
||||
const pm2Manager = new Pm2Manager({
|
||||
appName: app.key,
|
||||
script: pathEntry,
|
||||
pm2Connect: this.#pm2Connect
|
||||
});
|
||||
|
||||
// const isInstall = await checkInstall(app);
|
||||
// if (!isInstall) {
|
||||
// console.log('install failed');
|
||||
// return;
|
||||
// }
|
||||
const pm2Options: StartOptions = app.pm2Options || {};
|
||||
if (app?.engine) {
|
||||
pm2Options.interpreter = pm2Options.interpreter || app?.engine;
|
||||
}
|
||||
if (!pm2Options.cwd) {
|
||||
pm2Options.cwd = path.join(app.path, '../..');
|
||||
}
|
||||
await pm2Manager.start(pm2Options);
|
||||
} else {
|
||||
console.error('app type not support', app.type);
|
||||
}
|
||||
console.log(`load ${app.type} success`, app.key);
|
||||
return true;
|
||||
return await LoadApp(app, { mainApp, pm2Connect: this.#pm2Connect });
|
||||
}
|
||||
/**
|
||||
* create new app info
|
||||
@@ -308,24 +245,7 @@ export class Manager<T extends AppInfo = AppInfo> {
|
||||
if (!app) {
|
||||
return;
|
||||
}
|
||||
if (app.status === 'stop' && app.type === AppType.SystemApp) {
|
||||
console.log(`app ${key} is stopped`);
|
||||
return;
|
||||
}
|
||||
app.status = 'stop';
|
||||
if (app.type === AppType.MicroApp) {
|
||||
if (app.process) {
|
||||
app.process.kill();
|
||||
}
|
||||
}
|
||||
if (app.type === AppType.Pm2SystemApp) {
|
||||
const pm2Manager = new Pm2Manager({
|
||||
appName: app.key,
|
||||
script: app.entry,
|
||||
pm2Connect: this.#pm2Connect
|
||||
});
|
||||
await pm2Manager.stop();
|
||||
}
|
||||
await StopApp(app, { pm2Connect: this.#pm2Connect, todo: 'stop' });
|
||||
await this.saveAppInfo(app);
|
||||
}
|
||||
async restart(key: string) {
|
||||
@@ -393,8 +313,9 @@ export class Manager<T extends AppInfo = AppInfo> {
|
||||
* @param key
|
||||
* @returns
|
||||
*/
|
||||
async removeApp(key: string) {
|
||||
async removeApp(key: string, opts?: { deleteFile?: boolean }) {
|
||||
const app = this.apps.get(key);
|
||||
const deleteFile = opts?.deleteFile ?? true;
|
||||
if (!app) {
|
||||
return false;
|
||||
}
|
||||
@@ -414,6 +335,9 @@ export class Manager<T extends AppInfo = AppInfo> {
|
||||
} catch (e) {
|
||||
console.log('delete pm2 process error', e);
|
||||
}
|
||||
if (!deleteFile) {
|
||||
return true;
|
||||
}
|
||||
try {
|
||||
deleteFileAppInfo(key, this.appsPath);
|
||||
} catch (e) {
|
||||
@@ -485,7 +409,103 @@ export class Manager<T extends AppInfo = AppInfo> {
|
||||
}
|
||||
}
|
||||
}
|
||||
export const LoadApp = async (app: AppInfo, opts?: { mainApp?: any, pm2Connect?: any }) => {
|
||||
const mainApp = opts?.mainApp;
|
||||
const pm2Connect = opts?.pm2Connect;
|
||||
if (app.status !== 'running') {
|
||||
return false;
|
||||
}
|
||||
if (!fileIsExist(app.path)) {
|
||||
console.error('app is not found');
|
||||
return false;
|
||||
}
|
||||
const pathEntry = path.join(app.path, app.entry);
|
||||
if (!fileIsExist(pathEntry)) {
|
||||
console.error('file entry not found');
|
||||
return false;
|
||||
}
|
||||
const entry = app.entry + `?timestamp=${app?.timestamp}`;
|
||||
// 注册路由
|
||||
if (app.type === AppType.MicroApp) {
|
||||
const childProcess = fork(app.entry, [], {
|
||||
stdio: 'inherit', // 共享主进程的标准输入输出
|
||||
cwd: app.path,
|
||||
env: {
|
||||
...process.env,
|
||||
...app.env,
|
||||
APP_KEY: app.key,
|
||||
APP_PATH: app.path,
|
||||
APP_ENTRY: entry
|
||||
}
|
||||
});
|
||||
app.process = childProcess;
|
||||
} else if (app.type === AppType.SystemApp) {
|
||||
const pathEntryAndTimestamp = path.join(app.path, entry);
|
||||
// Windows下需要使用file://协议,并将反斜杠转换为正斜杠
|
||||
const importPath = process.platform === 'win32'
|
||||
? 'file:///' + pathEntryAndTimestamp.replace(/\\/g, '/')
|
||||
: pathEntryAndTimestamp;
|
||||
const module = await import(importPath);
|
||||
if (module.loadApp && mainApp) {
|
||||
await module.loadApp?.(mainApp, app);
|
||||
}
|
||||
} else if (app.type === AppType.GatewayApp) {
|
||||
console.log('gateway app not support');
|
||||
} else if (app.type === AppType.Pm2SystemApp) {
|
||||
const pathEntry = path.join(app.path, app.entry);
|
||||
const pm2Manager = new Pm2Manager({
|
||||
appName: app.key,
|
||||
script: pathEntry,
|
||||
pm2Connect: pm2Connect
|
||||
});
|
||||
if (app?.init) {
|
||||
const isInstall = await checkInstall(app);
|
||||
if (!isInstall) {
|
||||
console.log('install failed');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
const pm2Options: StartOptions = app.pm2Options || {};
|
||||
if (app?.engine) {
|
||||
pm2Options.interpreter = pm2Options.interpreter || app?.engine;
|
||||
}
|
||||
if (!pm2Options.cwd) {
|
||||
pm2Options.cwd = path.join(app.path, '../..');
|
||||
}
|
||||
await pm2Manager.start(pm2Options);
|
||||
} else if (app.type === AppType.ScriptApp) {
|
||||
// console.log('script app 直接运行,不需要启动');
|
||||
return true;
|
||||
} else {
|
||||
console.error('app type not support', app.type);
|
||||
}
|
||||
console.log(`load ${app.type} success`, app.key);
|
||||
return true;
|
||||
}
|
||||
|
||||
export const StopApp = async (app: AppInfo, opts?: { pm2Connect?: Pm2Connect, todo?: 'stop' | 'remove' | 'restart' }) => {
|
||||
const key = app.key;
|
||||
const pm2Connect = opts?.pm2Connect;
|
||||
const todo = opts?.todo || 'stop';
|
||||
if (app.status === 'stop' && app.type === AppType.SystemApp) {
|
||||
console.log(`app ${key} is stopped`);
|
||||
return;
|
||||
}
|
||||
app.status = 'stop';
|
||||
if (app.type === AppType.MicroApp) {
|
||||
if (app.process) {
|
||||
app.process.kill();
|
||||
}
|
||||
}
|
||||
if (app.type === AppType.Pm2SystemApp) {
|
||||
const pm2Manager = new Pm2Manager({
|
||||
appName: app.key,
|
||||
script: app.entry,
|
||||
pm2Connect: pm2Connect
|
||||
});
|
||||
await pm2Manager[todo]?.();
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 安装app通过key
|
||||
* @param key
|
||||
|
||||
@@ -108,6 +108,9 @@ export class Pm2Connect {
|
||||
}
|
||||
}
|
||||
type RunOptions = {
|
||||
/**
|
||||
* 是否在操作完成后退出连接
|
||||
*/
|
||||
needExit?: boolean;
|
||||
};
|
||||
export class Pm2Manager {
|
||||
@@ -226,6 +229,9 @@ export class Pm2Manager {
|
||||
this.pm2Connect.checkDisconnect(runOpts);
|
||||
}
|
||||
}
|
||||
async remove(runOpts?: RunOptions) {
|
||||
this.deleteProcess(runOpts);
|
||||
}
|
||||
async deleteProcess(runOpts?: RunOptions) {
|
||||
try {
|
||||
await this.pm2Connect.checkConnect();
|
||||
|
||||
@@ -17,8 +17,11 @@ type ProxyType = {
|
||||
user: string;
|
||||
key: string;
|
||||
path: string;
|
||||
indexPath: string;
|
||||
absolutePath?: string;
|
||||
type?: 'file';
|
||||
file: {
|
||||
indexPath: string;
|
||||
absolutePath: string;
|
||||
};
|
||||
};
|
||||
export type LocalProxyOpts = {
|
||||
watch?: boolean; // 是否监听文件变化
|
||||
@@ -44,7 +47,7 @@ export class LocalProxy {
|
||||
initFromAssistantConfig(assistantConfig?: AssistantConfig) {
|
||||
if (!assistantConfig) return;
|
||||
this.pagesDir = assistantConfig.configPath?.pagesDir || '';
|
||||
this.watch = !!assistantConfig.getCacheAssistantConfig()?.watch.enabled;
|
||||
this.watch = assistantConfig.getCacheAssistantConfig?.()?.watch?.enabled ?? true;
|
||||
this.init();
|
||||
if (this.watch) {
|
||||
this.onWatch();
|
||||
@@ -79,8 +82,10 @@ export class LocalProxy {
|
||||
user: user,
|
||||
key: app,
|
||||
path: `/${user}/${app}/`,
|
||||
indexPath: `${user}/${app}/index.html`,
|
||||
absolutePath: appPath,
|
||||
file: {
|
||||
indexPath: `${user}/${app}/index.html`,
|
||||
absolutePath: appPath,
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -112,14 +117,26 @@ export class LocalProxy {
|
||||
};
|
||||
fs.watch(frontAppDir, { recursive: true }, (eventType, filename) => {
|
||||
if (eventType === 'rename' || eventType === 'change') {
|
||||
// 过滤 node_modules 目录
|
||||
if (filename && filename.includes('node_modules')) {
|
||||
return;
|
||||
}
|
||||
// 只监听 js、html、css 文件
|
||||
const validExtensions = ['.js', '.html', '.css', '.json', '.png'];
|
||||
const hasValidExtension = validExtensions.some(ext => filename && filename.endsWith(ext));
|
||||
|
||||
if (!hasValidExtension) {
|
||||
return;
|
||||
}
|
||||
|
||||
const filePath = path.join(frontAppDir, filename);
|
||||
try {
|
||||
const stat = fs.statSync(filePath);
|
||||
if (stat.isDirectory() || filename.endsWith('.html')) {
|
||||
if (stat.isFile() || stat.isDirectory()) {
|
||||
// 重新加载
|
||||
debounce(that.init.bind(that), 5 * 1000);
|
||||
}
|
||||
} catch (error) {}
|
||||
} catch (error) { }
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ import { LocalProxy, LocalProxyOpts } from './index.ts';
|
||||
import http from 'node:http';
|
||||
import { fileProxy } from './proxy/file-proxy.ts';
|
||||
const localProxy = new LocalProxy({});
|
||||
let home = '/root/center';
|
||||
let home = '/root/home';
|
||||
export const initProxy = (data: LocalProxyOpts & { home?: string }) => {
|
||||
localProxy.pagesDir = data.pagesDir || '';
|
||||
localProxy.watch = data.watch ?? false;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
export type ProxyInfo = {
|
||||
/**
|
||||
* 代理路径, 比如/root/center, 匹配的路径
|
||||
* 代理路径, 比如/root/home, 匹配的路径
|
||||
*/
|
||||
path?: string;
|
||||
/**
|
||||
|
||||
@@ -2,6 +2,9 @@ import pm2 from 'pm2';
|
||||
import { logger } from './logger.ts';
|
||||
|
||||
export async function reload() {
|
||||
if (process.env.PM2_HOME === undefined) {
|
||||
return;
|
||||
}
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
pm2.connect((err) => {
|
||||
if (err) {
|
||||
|
||||
2
assistant/src/module/remote-app/.npmrc
Normal file
2
assistant/src/module/remote-app/.npmrc
Normal file
@@ -0,0 +1,2 @@
|
||||
//npm.xiongxiao.me/:_authToken=${ME_NPM_TOKEN}
|
||||
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
|
||||
20
assistant/src/module/remote-app/package.json
Normal file
20
assistant/src/module/remote-app/package.json
Normal file
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"name": "@kevisual/remote-app",
|
||||
"version": "0.0.1",
|
||||
"description": "",
|
||||
"main": "remote-app.ts",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"keywords": [],
|
||||
"files": [
|
||||
"remote-app.ts"
|
||||
],
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
},
|
||||
"author": "abearxiong <xiongxiao@xiongxiao.me> (https://www.xiongxiao.me)",
|
||||
"license": "MIT",
|
||||
"packageManager": "pnpm@10.26.0",
|
||||
"type": "module"
|
||||
}
|
||||
169
assistant/src/module/remote-app/remote-app.ts
Normal file
169
assistant/src/module/remote-app/remote-app.ts
Normal file
@@ -0,0 +1,169 @@
|
||||
import type { App } from '@kevisual/router';
|
||||
import { EventEmitter } from 'eventemitter3';
|
||||
type RemoteAppOptions = {
|
||||
app?: App;
|
||||
url?: string;
|
||||
token?: string;
|
||||
emitter?: EventEmitter;
|
||||
id?: string;
|
||||
};
|
||||
export class RemoteApp {
|
||||
mainApp: App;
|
||||
url: string;
|
||||
id: string;
|
||||
emitter: EventEmitter;
|
||||
isConnected: boolean;
|
||||
ws: WebSocket;
|
||||
remoteIsConnected: boolean;
|
||||
isError: boolean = false;
|
||||
constructor(opts?: RemoteAppOptions) {
|
||||
this.mainApp = opts?.app;
|
||||
const token = opts.token;
|
||||
const url = opts.url;
|
||||
const id = opts.id;
|
||||
this.emitter = opts?.emitter || new EventEmitter();
|
||||
const _url = new URL(url);
|
||||
if (token) {
|
||||
_url.searchParams.set('token', token);
|
||||
}
|
||||
_url.searchParams.set('id', id);
|
||||
this.url = _url.toString();
|
||||
this.id = id;
|
||||
this.init();
|
||||
}
|
||||
async isConnect(): Promise<boolean> {
|
||||
const that = this;
|
||||
if (this.isConnected) {
|
||||
return true;
|
||||
}
|
||||
return new Promise((resolve) => {
|
||||
const timeout = setTimeout(() => {
|
||||
resolve(false);
|
||||
that.emitter.off('open', listenOnce);
|
||||
}, 5000);
|
||||
const listenOnce = () => {
|
||||
clearTimeout(timeout);
|
||||
that.isConnected = true;
|
||||
that.remoteIsConnected = true;
|
||||
resolve(true);
|
||||
};
|
||||
that.emitter.once('open', listenOnce);
|
||||
});
|
||||
}
|
||||
getWsURL(url: string) {
|
||||
const { protocol } = new URL(url);
|
||||
const wsProtocol = protocol === 'https:' ? 'wss:' : 'ws:';
|
||||
const wsURL = url.toString().replace(protocol, wsProtocol);
|
||||
return wsURL;
|
||||
}
|
||||
async init() {
|
||||
if (!this.url) {
|
||||
throw new Error('No url provided for remote app');
|
||||
}
|
||||
if (!this.id) {
|
||||
throw new Error('No id provided for remote app');
|
||||
}
|
||||
this.isError = false;
|
||||
// 关闭已有连接
|
||||
if (this.ws) {
|
||||
this.ws.close();
|
||||
}
|
||||
const ws = new WebSocket(this.getWsURL(this.url));
|
||||
const that = this;
|
||||
ws.onopen = function () {
|
||||
that.isConnected = true;
|
||||
that.onOpen();
|
||||
};
|
||||
ws.onclose = function () {
|
||||
that.isConnected = false;
|
||||
that.onClose();
|
||||
}
|
||||
ws.onmessage = function (event) {
|
||||
that.onMessage(event.data);
|
||||
}
|
||||
ws.onerror = function (error) {
|
||||
that.onError(error);
|
||||
}
|
||||
this.ws = ws;
|
||||
}
|
||||
onOpen() {
|
||||
this.emitter.emit('open', this.id);
|
||||
}
|
||||
onClose() {
|
||||
console.log('远程应用关闭:', this.id);
|
||||
this.emitter.emit('close', this.id);
|
||||
this.isConnected = false;
|
||||
}
|
||||
onMessage(data: any) {
|
||||
this.emitter.emit('message', data);
|
||||
}
|
||||
onError(error: any) {
|
||||
console.error('远程应用错误:', this.id, error);
|
||||
this.isError = true;
|
||||
this.emitter.emit('error', error);
|
||||
}
|
||||
on(event: 'open' | 'close' | 'message' | 'error', listener: (data: any) => void) {
|
||||
this.emitter.on(event, listener);
|
||||
return () => {
|
||||
this.emitter.off(event, listener);
|
||||
};
|
||||
}
|
||||
|
||||
sendData(data: any) { }
|
||||
json(data: any) {
|
||||
this.ws.send(JSON.stringify(data));
|
||||
}
|
||||
listenProxy() {
|
||||
const remoteApp = this;
|
||||
const app = this.mainApp;
|
||||
const listenFn = async (event: any) => {
|
||||
try {
|
||||
const data = event.toString();
|
||||
const body = JSON.parse(data);
|
||||
const message = body.data || {};
|
||||
if (body?.code === 401) {
|
||||
console.error('远程应用认证失败,请检查 token 是否正确');
|
||||
this.isError = true;
|
||||
return;
|
||||
}
|
||||
if (body?.type !== 'proxy') return;
|
||||
if (!body.id) {
|
||||
remoteApp.json({
|
||||
id: body.id,
|
||||
data: {
|
||||
code: 400,
|
||||
message: 'id is required',
|
||||
},
|
||||
});
|
||||
return;
|
||||
|
||||
}
|
||||
const res = await app.call(message);
|
||||
remoteApp.json({
|
||||
id: body.id,
|
||||
data: {
|
||||
code: res.code,
|
||||
data: res.body,
|
||||
message: res.message,
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('处理远程代理请求出错:', error);
|
||||
}
|
||||
};
|
||||
remoteApp.json({
|
||||
id: this.id,
|
||||
type: 'registryClient'
|
||||
});
|
||||
remoteApp.emitter.on('message', listenFn);
|
||||
const closeMessage = () => {
|
||||
remoteApp.emitter.off('message', listenFn);
|
||||
}
|
||||
remoteApp.emitter.once('close', () => {
|
||||
closeMessage();
|
||||
});
|
||||
return () => {
|
||||
closeMessage();
|
||||
};
|
||||
}
|
||||
}
|
||||
34
assistant/src/module/upload/mv.ts
Normal file
34
assistant/src/module/upload/mv.ts
Normal file
@@ -0,0 +1,34 @@
|
||||
import type { AssistantConfig } from '@/module/assistant/index.ts';
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
export class UploadManager {
|
||||
config: AssistantConfig;
|
||||
constructor(config: AssistantConfig) {
|
||||
this.config = config;
|
||||
}
|
||||
mvFile(opts: {
|
||||
temppath: string;
|
||||
type: 'file' | 's3' | 'app-file';
|
||||
targetPath: string;
|
||||
}) {
|
||||
const { type = 'file', temppath, targetPath } = opts;
|
||||
const pageDir = this.config.configPath?.pagesDir!;
|
||||
const appsDir = this.config.configPath?.appsDir!;
|
||||
let dir = type === 'app-file' ? appsDir : pageDir;
|
||||
if (type === 'file' || type === 'app-file') {
|
||||
const fullTargetPath = targetPath.startsWith('/')
|
||||
? targetPath
|
||||
: path.join(dir, targetPath);
|
||||
const targetDir = fullTargetPath.substring(0, fullTargetPath.lastIndexOf('/'));
|
||||
if (!fs.existsSync(targetDir)) {
|
||||
fs.mkdirSync(targetDir, { recursive: true });
|
||||
}
|
||||
fs.renameSync(temppath, fullTargetPath);
|
||||
return fullTargetPath;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export const uploadManager = (config: AssistantConfig) => {
|
||||
return new UploadManager(config);
|
||||
}
|
||||
32
assistant/src/routes-simple/events.ts
Normal file
32
assistant/src/routes-simple/events.ts
Normal file
@@ -0,0 +1,32 @@
|
||||
import { simpleRouter, clients, getTaskId, writeEvents, deleteOldClients, error } from './router.ts';
|
||||
|
||||
simpleRouter.get('/client/events', async (req, res) => {
|
||||
res.writeHead(200, {
|
||||
'Content-Type': 'text/event-stream',
|
||||
'Cache-Control': 'no-cache',
|
||||
Connection: 'keep-alive',
|
||||
});
|
||||
const taskId = getTaskId(req);
|
||||
if (!taskId) {
|
||||
res.end(error('task-id is required'));
|
||||
return;
|
||||
}
|
||||
// 将客户端连接推送到 clients 数组
|
||||
clients.set(taskId, { client: res, createTime: Date.now() });
|
||||
writeEvents(req, { progress: 0, message: 'start' })
|
||||
// 移除客户端连接
|
||||
req.on('close', () => {
|
||||
clients.delete(taskId);
|
||||
});
|
||||
});
|
||||
|
||||
simpleRouter.get('/client/events/close', async (req, res) => {
|
||||
const taskId = getTaskId(req);
|
||||
if (!taskId) {
|
||||
res.end(error('task-id is required'));
|
||||
return;
|
||||
}
|
||||
deleteOldClients();
|
||||
clients.delete(taskId);
|
||||
res.end('ok');
|
||||
});
|
||||
1
assistant/src/routes-simple/index.ts
Normal file
1
assistant/src/routes-simple/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export * from './upload.ts'
|
||||
95
assistant/src/routes-simple/router.ts
Normal file
95
assistant/src/routes-simple/router.ts
Normal file
@@ -0,0 +1,95 @@
|
||||
import { simpleRouter } from '@/app.ts';
|
||||
import http from 'http';
|
||||
import { useContextKey } from '@kevisual/context';
|
||||
export { simpleRouter };
|
||||
import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
import fs from 'node:fs';
|
||||
/**
|
||||
* 缓存文件路径
|
||||
*/
|
||||
const defaultCachePath = path.join(os.homedir(), '.envision', 'cache-file');
|
||||
if (!fs.existsSync(defaultCachePath)) {
|
||||
fs.mkdirSync(defaultCachePath, { recursive: true });
|
||||
}
|
||||
export const cacheFilePath = defaultCachePath;
|
||||
|
||||
/**
|
||||
* 事件客户端
|
||||
*/
|
||||
const eventClientsInit = () => {
|
||||
const clients = new Map<string, { client?: http.ServerResponse; createTime?: number;[key: string]: any }>();
|
||||
return clients;
|
||||
};
|
||||
export const clients = useContextKey('event-clients', () => eventClientsInit());
|
||||
/**
|
||||
* 获取 task-id
|
||||
* @param req
|
||||
* @returns
|
||||
*/
|
||||
export const getTaskId = (req: http.IncomingMessage) => {
|
||||
const url = new URL(req.url || '', 'http://localhost');
|
||||
const taskId = url.searchParams.get('taskId');
|
||||
if (taskId) {
|
||||
return taskId;
|
||||
}
|
||||
return req.headers['task-id'] as string;
|
||||
};
|
||||
type EventData = {
|
||||
progress: number | string;
|
||||
message: string;
|
||||
};
|
||||
|
||||
/**
|
||||
* 写入事件
|
||||
* @param req
|
||||
* @param data
|
||||
*/
|
||||
export const writeEvents = (req: http.IncomingMessage, data: EventData) => {
|
||||
const taskId = getTaskId(req);
|
||||
if (taskId) {
|
||||
const client = clients.get(taskId)?.client;
|
||||
if (client) {
|
||||
client.write(`data: ${JSON.stringify(data)}\n\n`);
|
||||
}
|
||||
if (Number(data.progress) === 100) {
|
||||
clients.delete(taskId);
|
||||
}
|
||||
} else {
|
||||
console.log('taskId is remove.', taskId);
|
||||
}
|
||||
};
|
||||
/**
|
||||
* 查找超出2个小时的clients,都删除了
|
||||
*/
|
||||
export const deleteOldClients = () => {
|
||||
const now = Date.now();
|
||||
for (const [taskId, client] of clients) {
|
||||
// 如果创建时间超过2个小时,则删除
|
||||
if (now - client.createTime > 1000 * 60 * 60 * 2) {
|
||||
clients.delete(taskId);
|
||||
}
|
||||
}
|
||||
};
|
||||
/**
|
||||
* 解析表单数据, 如果表单数据是数组, 则取第一个,appKey, version, username 等
|
||||
* @param fields 表单数据
|
||||
* @param parseKeys 需要解析的键
|
||||
* @returns 解析后的数据
|
||||
*/
|
||||
export const getKey = (fields: Record<string, any>, parseKeys: string[]) => {
|
||||
let value: Record<string, any> = {};
|
||||
for (const key of parseKeys) {
|
||||
const v = fields[key];
|
||||
if (Array.isArray(v)) {
|
||||
value[key] = v[0];
|
||||
} else {
|
||||
value[key] = v;
|
||||
}
|
||||
}
|
||||
return value;
|
||||
};
|
||||
|
||||
export const error = (msg: string, code = 500) => {
|
||||
return JSON.stringify({ code, message: msg });
|
||||
};
|
||||
179
assistant/src/routes-simple/upload.ts
Normal file
179
assistant/src/routes-simple/upload.ts
Normal file
@@ -0,0 +1,179 @@
|
||||
|
||||
import Busboy from 'busboy';
|
||||
import { assistantConfig, simpleRouter } from '../app.ts'
|
||||
import http from 'http';
|
||||
import path from 'path';
|
||||
import fs from 'fs';
|
||||
|
||||
import { checkAuth } from '@/routes/index.ts';
|
||||
import { getTokenFromRequest } from '@/module/get-header-token.ts';
|
||||
import { pipeBusboy } from '@/module/assistant/proxy/pipe.ts';
|
||||
import { logger } from '@/module/logger.ts';
|
||||
import { cacheFilePath, getKey, writeEvents } from './router.ts';
|
||||
import { getContentType } from '@kevisual/oss/services';
|
||||
import { validateDirectory } from './utils.ts';
|
||||
import { UploadManager } from '@/module/upload/mv.ts';
|
||||
simpleRouter.get('/client/upload', async (req, res) => {
|
||||
if (res.headersSent) return; // 如果响应已发送,不再处理
|
||||
res.writeHead(200, { 'Content-Type': 'application/json' });
|
||||
res.end(JSON.stringify({ message: 'Upload endpoint reached' }));
|
||||
})
|
||||
export const error = (msg: string, code = 500) => {
|
||||
return JSON.stringify({ code, message: msg });
|
||||
};
|
||||
export const parseIfJson = (data = '{}') => {
|
||||
try {
|
||||
const _data = JSON.parse(data);
|
||||
if (typeof _data === 'object') return _data;
|
||||
return {};
|
||||
} catch (error) {
|
||||
return {};
|
||||
}
|
||||
};
|
||||
const uploadManager = new UploadManager(assistantConfig)
|
||||
export const uploadResources = async (req: http.IncomingMessage, res: http.ServerResponse) => {
|
||||
// const { tokenUser, token } = await checkAuth(req, res);
|
||||
const token = getTokenFromRequest(req);
|
||||
let tokenUser: any = null;
|
||||
const authResult = await checkAuth({ query: { token } });
|
||||
if (authResult.code === 200) {
|
||||
tokenUser = authResult.data?.tokenUser;
|
||||
} else {
|
||||
res.end(error(authResult.message, authResult.code));
|
||||
return;
|
||||
}
|
||||
if (!tokenUser) {
|
||||
res.end(error('Token is invalid.'));
|
||||
return;
|
||||
}
|
||||
const url = new URL(req.url || '', 'http://localhost');
|
||||
const share = !!url.searchParams.get('public');
|
||||
const meta = parseIfJson(url.searchParams.get('meta'));
|
||||
// 使用 busboy 解析 multipart/form-data
|
||||
const busboy = Busboy({ headers: req.headers, preservePath: true });
|
||||
const fields: any = {};
|
||||
const files: any[] = [];
|
||||
const filePromises: Promise<void>[] = [];
|
||||
let bytesReceived = 0;
|
||||
let bytesExpected = parseInt(req.headers['content-length'] || '0');
|
||||
busboy.on('field', (fieldname, value) => {
|
||||
fields[fieldname] = value;
|
||||
});
|
||||
|
||||
busboy.on('file', (fieldname, fileStream, info) => {
|
||||
const { filename, encoding, mimeType } = info;
|
||||
const tempPath = path.join(cacheFilePath, `${Date.now()}-${Math.random().toString(36).substring(7)}`);
|
||||
const writeStream = fs.createWriteStream(tempPath);
|
||||
const filePromise = new Promise<void>((resolve, reject) => {
|
||||
fileStream.on('data', (chunk) => {
|
||||
bytesReceived += chunk.length;
|
||||
if (bytesExpected > 0) {
|
||||
const progress = (bytesReceived / bytesExpected) * 100;
|
||||
const data = {
|
||||
progress: progress.toFixed(2),
|
||||
message: `Upload progress: ${progress.toFixed(2)}%`,
|
||||
};
|
||||
console.log('progress-upload', JSON.stringify(data, null, 2));
|
||||
writeEvents(req, data);
|
||||
}
|
||||
});
|
||||
|
||||
fileStream.pipe(writeStream);
|
||||
|
||||
writeStream.on('finish', () => {
|
||||
files.push({
|
||||
filepath: tempPath,
|
||||
originalFilename: filename,
|
||||
mimetype: mimeType,
|
||||
});
|
||||
resolve();
|
||||
});
|
||||
|
||||
writeStream.on('error', (err) => {
|
||||
reject(err);
|
||||
});
|
||||
});
|
||||
|
||||
filePromises.push(filePromise);
|
||||
});
|
||||
|
||||
busboy.on('finish', async () => {
|
||||
// 等待所有文件写入完成
|
||||
try {
|
||||
await Promise.all(filePromises);
|
||||
} catch (err) {
|
||||
logger.error(`File write error: ${err.message}`);
|
||||
res.end(error(`File write error: ${err.message}`));
|
||||
return;
|
||||
}
|
||||
const clearFiles = () => {
|
||||
files.forEach((file) => {
|
||||
if (file?.filepath && fs.existsSync(file.filepath)) {
|
||||
fs.unlinkSync(file.filepath);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
// 检查是否有文件上传
|
||||
if (files.length === 0) {
|
||||
res.end(error('files is required'));
|
||||
return;
|
||||
}
|
||||
console.log('fields', fields);
|
||||
let { appKey, version, username, directory } = getKey(fields, ['appKey', 'version', 'username', 'directory']);
|
||||
if (!appKey || !version) {
|
||||
res.end(error('appKey or version is not found, please check the upload config.'));
|
||||
clearFiles();
|
||||
return;
|
||||
}
|
||||
const { code, message } = validateDirectory(directory);
|
||||
if (code !== 200) {
|
||||
res.end(error(message));
|
||||
clearFiles();
|
||||
return;
|
||||
}
|
||||
// 逐个处理每个上传的文件
|
||||
const uploadedFiles = files;
|
||||
|
||||
const uploadResults = [];
|
||||
for (let i = 0; i < uploadedFiles.length; i++) {
|
||||
const file = uploadedFiles[i];
|
||||
// @ts-ignore
|
||||
const tempPath = file.filepath; // 文件上传时的临时路径
|
||||
const relativePath = file.originalFilename; // 保留表单中上传的文件名 (包含文件夹结构)
|
||||
// 比如 child2/b.txt
|
||||
const showVersion = false;
|
||||
const _version = showVersion ? `${version ? '/' + version : ''}` : '';
|
||||
const _directory = directory ? `/${directory}` : '';
|
||||
const minioPath = `${username || tokenUser.username || 'unknown'}/${appKey}${_version}${_directory}/${relativePath}`;
|
||||
uploadResults.push({
|
||||
name: relativePath,
|
||||
path: minioPath,
|
||||
});
|
||||
const type = 'file';
|
||||
uploadManager.mvFile({
|
||||
type: 'file',
|
||||
temppath: tempPath,
|
||||
targetPath: minioPath,
|
||||
})
|
||||
if (type !== 'file') {
|
||||
fs.unlinkSync(tempPath); // 删除临时文件
|
||||
}
|
||||
}
|
||||
|
||||
res.writeHead(200, { 'Content-Type': 'application/json' });
|
||||
res.end(
|
||||
JSON.stringify({
|
||||
code: 200,
|
||||
data: {
|
||||
detect: [],
|
||||
upload: uploadResults,
|
||||
},
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
pipeBusboy(req, res, busboy);
|
||||
}
|
||||
|
||||
simpleRouter.post('/client/upload', uploadResources);
|
||||
30
assistant/src/routes-simple/utils.ts
Normal file
30
assistant/src/routes-simple/utils.ts
Normal file
@@ -0,0 +1,30 @@
|
||||
/**
|
||||
* 校验directory是否合法, 合法返回200, 不合法返回500
|
||||
*
|
||||
* directory 不能以/开头,不能以/结尾。不能以.开头,不能以.结尾。
|
||||
* 把directory的/替换掉后,只能包含数字、字母、下划线、中划线
|
||||
* @param directory 目录
|
||||
* @returns
|
||||
*/
|
||||
export const validateDirectory = (directory?: string) => {
|
||||
// 对directory进行校验,不能以/开头,不能以/结尾。不能以.开头,不能以.结尾。
|
||||
if (directory && (directory.startsWith('/') || directory.endsWith('/') || directory.startsWith('..') || directory.endsWith('..'))) {
|
||||
return {
|
||||
code: 500,
|
||||
message: 'directory is invalid',
|
||||
};
|
||||
}
|
||||
// 把directory的/替换掉后,只能包含数字、字母、下划线、中划线
|
||||
// 可以包含.
|
||||
let _directory = directory?.replace(/\//g, '');
|
||||
if (_directory && !/^[a-zA-Z0-9_.-]+$/.test(_directory)) {
|
||||
return {
|
||||
code: 500,
|
||||
message: 'directory is invalid, only number, letter, underline and hyphen are allowed',
|
||||
};
|
||||
}
|
||||
return {
|
||||
code: 200,
|
||||
message: 'directory is valid',
|
||||
};
|
||||
};
|
||||
32
assistant/src/routes/call/index.ts
Normal file
32
assistant/src/routes/call/index.ts
Normal file
@@ -0,0 +1,32 @@
|
||||
|
||||
import { app } from '../../app.ts';
|
||||
import { createSkill, tool } from '@kevisual/router';
|
||||
|
||||
app.route({
|
||||
path: 'call',
|
||||
key: '',
|
||||
description: '调用',
|
||||
middleware: ['auth'],
|
||||
metadata: {
|
||||
tags: ['opencode'],
|
||||
...createSkill({
|
||||
skill: 'call-app',
|
||||
title: '调用app应用',
|
||||
summary: '调用router的应用, 参数path, key, payload',
|
||||
args: {
|
||||
path: tool.schema.string().describe('应用路径,例如 cnb'),
|
||||
key: tool.schema.string().optional().describe('应用key,例如 list-repos'),
|
||||
payload: tool.schema.object({}).optional().describe('调用参数'),
|
||||
}
|
||||
})
|
||||
},
|
||||
}).define(async (ctx) => {
|
||||
const { path, key = '' } = ctx.query;
|
||||
if (!path) {
|
||||
ctx.throw('路径path不能为空');
|
||||
}
|
||||
const res = await ctx.run({ path, key, payload: ctx.query.payload || {} }, {
|
||||
...ctx
|
||||
});
|
||||
ctx.forward(res);
|
||||
}).addTo(app)
|
||||
@@ -21,7 +21,16 @@ app
|
||||
})
|
||||
.define(async (ctx) => {
|
||||
const { data } = ctx.query;
|
||||
ctx.body = assistantConfig.setConfig(data);
|
||||
ctx.body = assistantConfig.setConfig(data, true);
|
||||
reload();
|
||||
})
|
||||
.addTo(app);
|
||||
|
||||
app.route({
|
||||
path: 'config',
|
||||
key: 'getId'
|
||||
}).define(async (ctx) => {
|
||||
const config = assistantConfig.getCacheAssistantConfig();
|
||||
ctx.body = config?.app?.id || null;
|
||||
|
||||
}).addTo(app);
|
||||
37
assistant/src/routes/ha-api/ha.ts
Normal file
37
assistant/src/routes/ha-api/ha.ts
Normal file
@@ -0,0 +1,37 @@
|
||||
import { LightHA } from "@kevisual/ha-api";
|
||||
export const lightHA = new LightHA({ token: process.env.HAAS_TOKEN || '', homeassistantURL: process.env.HAAS_URL });
|
||||
|
||||
export const callText = async (text: string) => {
|
||||
const command = text?.trim().slice(0, 20);
|
||||
type ParseCommand = {
|
||||
type?: '打开' | '关闭',
|
||||
appName?: string,
|
||||
command?: string,
|
||||
}
|
||||
let obj: ParseCommand = {};
|
||||
if (command.startsWith('打开')) {
|
||||
obj.appName = command.replace('打开', '').trim();
|
||||
obj.type = '打开';
|
||||
} else if (command.startsWith('关闭')) {
|
||||
obj.appName = command.replace('关闭', '').trim();
|
||||
obj.type = '关闭';
|
||||
}
|
||||
let endTime = Date.now();
|
||||
if (obj.type) {
|
||||
try {
|
||||
const search = await lightHA.searchLight(obj.appName || '');
|
||||
console.log('searchTime', Date.now() - endTime);
|
||||
if (search.id) {
|
||||
await lightHA.runService({ entity_id: search.id, service: obj.type === '打开' ? 'turn_on' : 'turn_off' });
|
||||
} else if (search.hasMore) {
|
||||
const [first] = search.result;
|
||||
await lightHA.runService({ entity_id: first.entity_id, service: obj.type === '打开' ? 'turn_on' : 'turn_off' });
|
||||
} else {
|
||||
console.log('未找到对应设备:', obj.appName);
|
||||
}
|
||||
console.log('解析到控制指令', obj);
|
||||
} catch (e) {
|
||||
console.error('控制失败', e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
import { app } from '@/app.ts';
|
||||
import { Hotkeys } from '@kevisual/hot-api';
|
||||
// import { Hotkeys } from '@kevisual/hot-api';
|
||||
import { Hotkeys } from './lib.ts';
|
||||
import { useContextKey } from '@kevisual/context';
|
||||
app.route({
|
||||
path: 'key-sender',
|
||||
@@ -16,4 +17,4 @@ app.route({
|
||||
});
|
||||
}
|
||||
ctx.body = 'ok';
|
||||
}).addTo(app);
|
||||
}).addTo(app);
|
||||
|
||||
89
assistant/src/routes/hot-api/key-sender/lib.ts
Normal file
89
assistant/src/routes/hot-api/key-sender/lib.ts
Normal file
@@ -0,0 +1,89 @@
|
||||
import { keyboard, Key } from "@nut-tree-fork/nut-js";
|
||||
|
||||
/**
|
||||
* 控制功能部分的案件映射
|
||||
*/
|
||||
export const keyMap: Record<string, Key> = {
|
||||
'ctrl': Key.LeftControl,
|
||||
'leftctrl': Key.LeftControl,
|
||||
'rightctrl': Key.RightControl,
|
||||
'alt': Key.LeftAlt,
|
||||
'leftalt': Key.LeftAlt,
|
||||
'rightalt': Key.RightAlt,
|
||||
'shift': Key.LeftShift,
|
||||
'leftshift': Key.LeftShift,
|
||||
'rightshift': Key.RightShift,
|
||||
'meta': Key.LeftSuper,
|
||||
'cmd': Key.LeftCmd,
|
||||
'win': Key.LeftWin,
|
||||
// 根据操作系统选择 Ctrl 或 Command 键
|
||||
'ctrlorcommand': process.platform === 'darwin' ? Key.LeftCmd : Key.LeftControl,
|
||||
};
|
||||
|
||||
/**
|
||||
* 将快捷键字符串转换为 Key 枚举值
|
||||
* @param hotkey
|
||||
* @returns
|
||||
*/
|
||||
export const parseHotkey = (hotkey: string): Key[] => {
|
||||
return hotkey
|
||||
.toLowerCase()
|
||||
.split('+')
|
||||
.map(key => {
|
||||
const trimmed = key.trim().toLowerCase();
|
||||
// 如果是修饰键,从映射表中获取
|
||||
if (keyMap[trimmed]) {
|
||||
return keyMap[trimmed];
|
||||
}
|
||||
// 如果是字母,转换为大写并查找对应的 Key
|
||||
if (trimmed.length === 1 && /[a-z]/.test(trimmed)) {
|
||||
const upperKey = trimmed.toUpperCase();
|
||||
return Key[upperKey as keyof typeof Key] as Key;
|
||||
}
|
||||
// 其他情况直接查找
|
||||
return Key[trimmed as keyof typeof Key] as Key;
|
||||
})
|
||||
.filter((key): key is Key => key !== undefined);
|
||||
}
|
||||
|
||||
type PressHostKeysOptions = {
|
||||
hotkey: string;
|
||||
durationMs?: number;
|
||||
}
|
||||
export const pressHotkey = async (opts: PressHostKeysOptions): Promise<boolean> => {
|
||||
const { hotkey, durationMs = 100 } = opts;
|
||||
const keys = parseHotkey(hotkey);
|
||||
|
||||
console.log('准备模拟按下快捷键:', hotkey);
|
||||
// 同时按下所有键
|
||||
await keyboard.pressKey(...keys);
|
||||
// 短暂延迟后释放
|
||||
await new Promise(resolve => setTimeout(resolve, durationMs));
|
||||
// 释放所有键
|
||||
await keyboard.releaseKey(...keys);
|
||||
return true
|
||||
}
|
||||
|
||||
/**
|
||||
* 模拟按下一组快捷键,支持逗号分隔的多个快捷键
|
||||
* @param opts
|
||||
* @returns
|
||||
*/
|
||||
export const pressHotkeys = async (opts: PressHostKeysOptions): Promise<boolean> => {
|
||||
let { hotkey } = opts;
|
||||
hotkey = hotkey.replace(/\s+/g, ''); // 去除所有空格
|
||||
const hotkeyList = hotkey.split(',').map(hk => hk.trim());
|
||||
if (hotkeyList.length === 0) {
|
||||
return await pressHotkey({ ...opts, hotkey });
|
||||
}
|
||||
for (const hk of hotkeyList) {
|
||||
await pressHotkey({ ...opts, hotkey: hk });
|
||||
// 每个快捷键之间稍作延迟
|
||||
await new Promise(resolve => setTimeout(resolve, 200));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
export class Hotkeys {
|
||||
pressHotkey = pressHotkey;
|
||||
pressHotkeys = pressHotkeys;
|
||||
}
|
||||
@@ -5,52 +5,98 @@ import './ai/index.ts';
|
||||
// TODO:
|
||||
// import './light-code/index.ts';
|
||||
import './user/index.ts';
|
||||
import './hot-api/key-sender/index.ts';
|
||||
import './call/index.ts'
|
||||
|
||||
// TODO: 移除
|
||||
// import './hot-api/key-sender/index.ts';
|
||||
import './opencode/index.ts';
|
||||
import './remote/index.ts';
|
||||
|
||||
import os from 'node:os';
|
||||
import { authCache } from '@/module/cache/auth.ts';
|
||||
export const getTokenUser = async (ctx: any) => {
|
||||
import { createSkill } from '@kevisual/router';
|
||||
import { logger } from '@/module/logger.ts';
|
||||
const getTokenUser = async (token: string) => {
|
||||
const query = assistantConfig.query
|
||||
const res = await query.post({
|
||||
path: 'user',
|
||||
key: 'me',
|
||||
token: ctx.state.token,
|
||||
token: token,
|
||||
});
|
||||
if (res.code !== 200) {
|
||||
return ctx.throw(401, 'not login');
|
||||
}
|
||||
const tokenUser = res.data || {};
|
||||
return tokenUser;
|
||||
return res;
|
||||
}
|
||||
const checkAuth = async (ctx: any, isAdmin = false) => {
|
||||
export const getTokenUserCache = async (token: string) => {
|
||||
const tokenUser = await authCache.get(token);
|
||||
if (tokenUser) {
|
||||
return {
|
||||
code: 200,
|
||||
data: tokenUser,
|
||||
};
|
||||
}
|
||||
const res = await getTokenUser(token);
|
||||
if (res.code === 200) {
|
||||
authCache.set(token, res.data);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
export const checkAuth = async (ctx: any, isAdmin = false) => {
|
||||
const config = assistantConfig.getConfig();
|
||||
const { auth = {} } = config;
|
||||
const token = ctx.query.token;
|
||||
|
||||
logger.debug('checkAuth', ctx.query, { token });
|
||||
if (!token) {
|
||||
return ctx.throw(401, 'not login');
|
||||
return {
|
||||
code: 401,
|
||||
message: '未登录',
|
||||
}
|
||||
}
|
||||
// 鉴权代理
|
||||
let tokenUser = await authCache.get(token);
|
||||
if (!tokenUser) {
|
||||
tokenUser = await getTokenUser(ctx);
|
||||
const tokenUserRes = await getTokenUser(token);
|
||||
if (tokenUserRes.code !== 200) {
|
||||
return {
|
||||
code: tokenUserRes.code,
|
||||
message: '验证失败' + tokenUserRes.message,
|
||||
}
|
||||
} else {
|
||||
tokenUser = tokenUserRes.data;
|
||||
}
|
||||
authCache.set(token, tokenUser);
|
||||
}
|
||||
ctx.state = {
|
||||
...ctx.state,
|
||||
token,
|
||||
tokenUser,
|
||||
};
|
||||
if (ctx.state) {
|
||||
ctx.state = {
|
||||
...ctx.state,
|
||||
token,
|
||||
tokenUser,
|
||||
};
|
||||
}
|
||||
const { username } = tokenUser;
|
||||
if (!auth.username) {
|
||||
// 初始管理员账号
|
||||
auth.username = username;
|
||||
assistantConfig.setConfig({ auth });
|
||||
}
|
||||
if (isAdmin) {
|
||||
if (auth.username && auth.username !== username) {
|
||||
return ctx.throw(403, 'not admin user');
|
||||
if (isAdmin && auth.username) {
|
||||
const admins = config.auth?.admin || [];
|
||||
let isCheckAdmin = false;
|
||||
const admin = auth.username;
|
||||
if (admin === username) {
|
||||
isCheckAdmin = true;
|
||||
}
|
||||
if (!isCheckAdmin && admins.length > 0 && admins.includes(username)) {
|
||||
isCheckAdmin = true;
|
||||
}
|
||||
if (!isCheckAdmin) {
|
||||
return {
|
||||
code: 403,
|
||||
message: '非管理员用户',
|
||||
}
|
||||
}
|
||||
}
|
||||
return {
|
||||
code: 200,
|
||||
data: { tokenUser, token }
|
||||
}
|
||||
};
|
||||
app
|
||||
@@ -60,7 +106,13 @@ app
|
||||
description: '获取当前登录用户信息, 第一个登录的用户为管理员用户',
|
||||
})
|
||||
.define(async (ctx) => {
|
||||
await checkAuth(ctx);
|
||||
if (!ctx.query?.token && ctx.appId === app.appId) {
|
||||
return;
|
||||
}
|
||||
const authResult = await checkAuth(ctx);
|
||||
if (authResult.code !== 200) {
|
||||
ctx.throw(authResult.code, authResult.message);
|
||||
}
|
||||
})
|
||||
.addTo(app);
|
||||
app
|
||||
@@ -70,7 +122,14 @@ app
|
||||
description: '管理员鉴权, 获取用户信息,并验证是否为管理员。',
|
||||
})
|
||||
.define(async (ctx) => {
|
||||
await checkAuth(ctx, true);
|
||||
logger.debug('query', ctx.query);
|
||||
if (!ctx.query?.token && ctx.appId === app.appId) {
|
||||
return;
|
||||
}
|
||||
const authResult = await checkAuth(ctx, true);
|
||||
if (authResult.code !== 200) {
|
||||
ctx.throw(authResult.code, authResult.message);
|
||||
}
|
||||
})
|
||||
.addTo(app);
|
||||
|
||||
@@ -104,6 +163,14 @@ app
|
||||
path: 'client',
|
||||
key: 'system',
|
||||
description: '获取系统信息',
|
||||
metadata: {
|
||||
tags: ['opencode'],
|
||||
...createSkill({
|
||||
skill: 'view-system-info',
|
||||
title: '查看系统信息',
|
||||
summary: '获取服务器操作系统平台、架构和版本信息',
|
||||
})
|
||||
}
|
||||
})
|
||||
.define(async (ctx) => {
|
||||
const { platform, arch, release } = os;
|
||||
|
||||
@@ -4,7 +4,8 @@ import { runCode } from '../../module/light-code/run.ts'
|
||||
|
||||
// http://localhost:4005/api/router?path=call
|
||||
app.route({
|
||||
path: 'call',
|
||||
path: 'light-code',
|
||||
key: 'call',
|
||||
// middleware: ['auth']
|
||||
}).define(async (ctx) => {
|
||||
const filename = ctx.query?.filename || 'root/light-code-demo/demo-router.ts'
|
||||
|
||||
1
assistant/src/routes/opencode/index.ts
Normal file
1
assistant/src/routes/opencode/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
import './ls.ts'
|
||||
127
assistant/src/routes/opencode/ls.ts
Normal file
127
assistant/src/routes/opencode/ls.ts
Normal file
@@ -0,0 +1,127 @@
|
||||
import { app } from '@/app.ts'
|
||||
import { createSkill, tool } from "@kevisual/router";
|
||||
import { opencodeManager } from './module/open.ts'
|
||||
import path from "node:path";
|
||||
import { execSync } from "node:child_process";
|
||||
import { useKey } from '@kevisual/use-config';
|
||||
|
||||
// 创建一个opencode 客户端
|
||||
app.route({
|
||||
path: 'opencode',
|
||||
key: 'create',
|
||||
middleware: ['auth'],
|
||||
description: '创建 OpenCode 客户端',
|
||||
metadata: {
|
||||
tags: ['opencode'],
|
||||
...createSkill({
|
||||
skill: 'create-opencode-client',
|
||||
title: '创建 OpenCode 客户端',
|
||||
summary: '创建 OpenCode 客户端,如果存在则复用',
|
||||
args: {
|
||||
|
||||
}
|
||||
})
|
||||
},
|
||||
}).define(async (ctx) => {
|
||||
const client = await opencodeManager.getClient();
|
||||
ctx.body = { content: `${opencodeManager.url} OpenCode 客户端已就绪` };
|
||||
}).addTo(app);
|
||||
|
||||
// 关闭 opencode 客户端
|
||||
app.route({
|
||||
path: 'opencode',
|
||||
key: 'close',
|
||||
middleware: ['auth'],
|
||||
description: '关闭 OpenCode 客户端',
|
||||
metadata: {
|
||||
tags: ['opencode'],
|
||||
...createSkill({
|
||||
skill: 'close-opencode-client',
|
||||
title: '关闭 OpenCode 客户端',
|
||||
summary: '关闭 OpenCode 客户端',
|
||||
args: {
|
||||
|
||||
}
|
||||
})
|
||||
},
|
||||
}).define(async (ctx) => {
|
||||
await opencodeManager.close();
|
||||
ctx.body = { content: 'OpenCode 客户端已关闭' };
|
||||
}).addTo(app);
|
||||
|
||||
// 调用 path: opencode key: getUrl
|
||||
app.route({
|
||||
path: 'opencode',
|
||||
key: 'getUrl',
|
||||
middleware: ['auth'],
|
||||
description: '获取 OpenCode 服务 URL',
|
||||
metadata: {
|
||||
tags: ['opencode'],
|
||||
...createSkill({
|
||||
skill: 'get-opencode-url',
|
||||
title: '获取 OpenCode 服务 URL',
|
||||
summary: '获取当前 OpenCode 服务的 URL 地址',
|
||||
args: {
|
||||
|
||||
}
|
||||
})
|
||||
},
|
||||
}).define(async (ctx) => {
|
||||
const url = await opencodeManager.getUrl();
|
||||
const cnbURL = useKey('CNB_VSCODE_PROXY_URI') as string | undefined;
|
||||
let content = `本地访问地址: ${url}`
|
||||
if (cnbURL) {
|
||||
content += `\n云端访问地址: ${cnbURL.replace('{{port}}', '5000')}`;
|
||||
}
|
||||
ctx.body = { content };
|
||||
}).addTo(app);
|
||||
// 调用 path: opencode key: ls-projects
|
||||
app.route({
|
||||
path: 'opencode',
|
||||
key: 'ls-projects'
|
||||
}).define(async (ctx) => {
|
||||
const client = await opencodeManager.getClient();
|
||||
const projects = await client.project.list();
|
||||
const currentProject = await client.project.current();
|
||||
ctx.body = {
|
||||
projects,
|
||||
currentProject
|
||||
};
|
||||
}).addTo(app);
|
||||
|
||||
// 调用 path: opencode key: runProject 参数 /home/ubuntu/cli/assistant
|
||||
app.route({
|
||||
path: 'opencode',
|
||||
key: 'runProject',
|
||||
middleware: ['auth'],
|
||||
metadata: {
|
||||
tags: ['opencode'],
|
||||
...createSkill({
|
||||
skill: 'run-opencode-project',
|
||||
title: '运行 OpenCode 项目',
|
||||
summary: '运行一个已有的 OpenCode 项目',
|
||||
args: {
|
||||
projectPath: tool.schema.string().optional().describe('OpenCode 项目的路径, 默认为 /workspace')
|
||||
}
|
||||
})
|
||||
}
|
||||
}).define(async (ctx) => {
|
||||
const { projectPath = '/workspace' } = ctx.query;
|
||||
try {
|
||||
|
||||
// const directory = path.resolve(projectPath);
|
||||
// const runOpencodeCli = 'opencode run hello';
|
||||
// execSync(runOpencodeCli, { cwd: directory, stdio: 'inherit' });
|
||||
// ctx.body = { content: `OpenCode 项目已在路径 ${directory} 运行` };
|
||||
const client = await opencodeManager.getClient();
|
||||
const session = await client.session.create({
|
||||
query: {
|
||||
directory: projectPath
|
||||
}
|
||||
})
|
||||
console.log('Created session:', session.data.id);
|
||||
ctx.body = { content: `OpenCode 项目已在路径 ${projectPath} 运行` };
|
||||
} catch (error) {
|
||||
ctx.body = { content: `运行 OpenCode 项目失败, 请手动运行命令初始化: opencode run hello` };
|
||||
}
|
||||
}).addTo(app);
|
||||
127
assistant/src/routes/opencode/module/open.ts
Normal file
127
assistant/src/routes/opencode/module/open.ts
Normal file
@@ -0,0 +1,127 @@
|
||||
import { createOpencode, createOpencodeClient, OpencodeClient, } from "@opencode-ai/sdk";
|
||||
import { randomInt } from "es-toolkit";
|
||||
import getPort from "get-port";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
import fs from "node:fs";
|
||||
import { execSync } from "node:child_process";
|
||||
|
||||
|
||||
export class OpencodeManager {
|
||||
private static instance: OpencodeManager | null = null;
|
||||
private client: OpencodeClient | null = null;
|
||||
private server: { url: string; close(): void } | null = null;
|
||||
private isInitializing: boolean = false;
|
||||
private currentPort: number | null = null;
|
||||
|
||||
public url: string = '';
|
||||
private constructor() { }
|
||||
|
||||
static getInstance(): OpencodeManager {
|
||||
if (!OpencodeManager.instance) {
|
||||
OpencodeManager.instance = new OpencodeManager();
|
||||
}
|
||||
return OpencodeManager.instance;
|
||||
}
|
||||
|
||||
async getClient(): Promise<OpencodeClient> {
|
||||
// 如果已经有 client,直接返回
|
||||
if (this.client) {
|
||||
return this.client;
|
||||
}
|
||||
|
||||
// 如果正在初始化,等待初始化完成
|
||||
if (this.isInitializing) {
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
return this.getClient();
|
||||
}
|
||||
|
||||
// 开始初始化
|
||||
this.isInitializing = true;
|
||||
try {
|
||||
const port = 5000;
|
||||
const currentPort = await getPort({ port: port });
|
||||
if (port === currentPort) {
|
||||
const result = await createOpencode({
|
||||
hostname: '0.0.0.0',
|
||||
port: port
|
||||
});
|
||||
this.url = result.server.url;
|
||||
this.client = result.client;
|
||||
this.server = result.server;
|
||||
return this.client;
|
||||
} else {
|
||||
this.client = await this.createOpencodeProject({ port });
|
||||
this.url = `http://localhost:${port}`;
|
||||
return this.client;
|
||||
}
|
||||
} finally {
|
||||
this.isInitializing = false;
|
||||
}
|
||||
}
|
||||
async createOpencodeProject({
|
||||
directory,
|
||||
port = 5000
|
||||
}: { directory?: string, port?: number }): Promise<OpencodeClient> {
|
||||
const client = createOpencodeClient({
|
||||
baseUrl: `http://localhost:${port}`,
|
||||
directory
|
||||
});
|
||||
return client;
|
||||
}
|
||||
async killPort(port: number): Promise<void> {
|
||||
try {
|
||||
// 尝试 使用命令行去关闭 port为5000的服务
|
||||
if (os.platform() === 'win32') {
|
||||
// Windows 平台
|
||||
execSync(`netstat -ano | findstr :${port} | findstr LISTENING`).toString().split('\n').forEach(line => {
|
||||
const parts = line.trim().split(/\s+/);
|
||||
const pid = parts[parts.length - 1];
|
||||
if (pid) {
|
||||
execSync(`taskkill /PID ${pid} /F`);
|
||||
console.log(`OpencodeManager: 已关闭占用端口 ${port} 的进程 PID ${pid}`);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
// Unix-like 平台
|
||||
const result = execSync(`lsof -i :${port} -t`).toString();
|
||||
result.split('\n').forEach(pid => {
|
||||
if (pid) {
|
||||
execSync(`kill -9 ${pid}`);
|
||||
console.log(`OpencodeManager: 已关闭占用端口 ${port} 的进程 PID ${pid}`);
|
||||
}
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to close OpenCode server:', error);
|
||||
}
|
||||
}
|
||||
async close(): Promise<void> {
|
||||
if (this.server) {
|
||||
this.server.close();
|
||||
this.server = null;
|
||||
return
|
||||
}
|
||||
const port = 5000;
|
||||
const currentPort = await getPort({ port: port });
|
||||
if (port === currentPort) {
|
||||
this.client = null;
|
||||
return;
|
||||
} else {
|
||||
await this.killPort(port);
|
||||
}
|
||||
|
||||
this.client = null;
|
||||
}
|
||||
async getUrl(): Promise<string> {
|
||||
if (this.url) {
|
||||
return this.url;
|
||||
}
|
||||
if (!this.url) {
|
||||
await this.getClient();
|
||||
}
|
||||
return 'http://localhost:5000';
|
||||
}
|
||||
}
|
||||
|
||||
export const opencodeManager = OpencodeManager.getInstance();
|
||||
54
assistant/src/routes/remote/index.ts
Normal file
54
assistant/src/routes/remote/index.ts
Normal file
@@ -0,0 +1,54 @@
|
||||
import { useContextKey } from "@kevisual/context";
|
||||
import { app } from "../../app.ts";
|
||||
import { AssistantApp } from "@/lib.ts";
|
||||
|
||||
app.route({
|
||||
path: 'remote',
|
||||
key: 'status',
|
||||
middleware: ['admin-auth'],
|
||||
description: '获取远程app连接状态',
|
||||
}).define(async (ctx) => {
|
||||
const manager = useContextKey('manager') as AssistantApp;
|
||||
if (manager?.remoteApp?.isConnect()) {
|
||||
const url = manager.remoteUrl || ''
|
||||
ctx.body = {
|
||||
content: `远程app已经链接, 访问地址:${url}`,
|
||||
}
|
||||
} else {
|
||||
ctx.body = {
|
||||
content: '远程app未连接',
|
||||
}
|
||||
}
|
||||
}).addTo(app);
|
||||
|
||||
app.route({
|
||||
path: 'remote',
|
||||
key: 'connect',
|
||||
middleware: ['admin-auth'],
|
||||
description: '连接远程app',
|
||||
}).define(async (ctx) => {
|
||||
const manager = useContextKey('manager') as AssistantApp;
|
||||
if (!manager) {
|
||||
ctx.body = {
|
||||
content: '远程app管理器未初始化',
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (manager?.remoteApp?.isConnect()) {
|
||||
const url = manager.remoteUrl || ''
|
||||
ctx.body = {
|
||||
content: `远程app已经链接, 访问地址:${url}`,
|
||||
}
|
||||
return;
|
||||
}
|
||||
await manager.initRemoteApp({ enabled: true, token: ctx.query?.token }).then(() => {
|
||||
ctx.body = {
|
||||
content: '远程app连接成功',
|
||||
}
|
||||
}).catch((err) => {
|
||||
ctx.body = {
|
||||
content: `远程app连接失败: ${err.message}`,
|
||||
}
|
||||
});
|
||||
|
||||
}).addTo(app);
|
||||
@@ -47,7 +47,7 @@ app
|
||||
}
|
||||
})
|
||||
.define(async (ctx) => {
|
||||
// https://localhost:51015/client/router?path=shop&key=install
|
||||
// https://localhost:51515/client/router?path=shop&key=install
|
||||
const options = ctx.query?.data || {};
|
||||
const { id, type, force, yes } = options;
|
||||
assistantConfig.checkMounted();
|
||||
@@ -74,7 +74,7 @@ app
|
||||
}
|
||||
})
|
||||
.define(async (ctx) => {
|
||||
// https://localhost:51015/client/router?path=shop&key=uninstall
|
||||
// https://localhost:51515/client/router?path=shop&key=uninstall
|
||||
const options = ctx.query?.data || {};
|
||||
const { id, type, yes } = options;
|
||||
const app = new AppDownload(assistantConfig);
|
||||
|
||||
@@ -6,29 +6,77 @@ app.route({
|
||||
description: '管理员用户登录',
|
||||
}).define(async (ctx) => {
|
||||
const { username, password } = ctx.query;
|
||||
const query = assistantConfig.query;
|
||||
const auth = assistantConfig.getConfig().auth || {};
|
||||
const res = await query.post({
|
||||
path: 'user',
|
||||
key: 'login',
|
||||
data: {
|
||||
username,
|
||||
password,
|
||||
},
|
||||
})
|
||||
if (res.code !== 200) {
|
||||
return ctx.throw(401, 'login failed');
|
||||
}
|
||||
const loginUser = res.data.username;
|
||||
if (auth.username && loginUser !== auth.username) {
|
||||
if (auth && auth.username && auth.username !== username) {
|
||||
return ctx.throw(403, 'login user is not admin user');
|
||||
}
|
||||
if (!auth.username) {
|
||||
// 初始管理员账号
|
||||
auth.username = loginUser;
|
||||
assistantConfig.setConfig({ auth });
|
||||
}
|
||||
// 保存配置
|
||||
// 发起请求,转发客户端 cookie
|
||||
const res = await fetch(`${assistantConfig.baseURL}`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
path: 'user',
|
||||
key: 'login',
|
||||
username,
|
||||
password,
|
||||
}),
|
||||
});
|
||||
|
||||
ctx.body = res.data;
|
||||
// 转发上游服务器返回的所有 set-cookie(支持多个 cookie)
|
||||
const setCookieHeaders = res.headers.getSetCookie?.() || [];
|
||||
if (setCookieHeaders.length > 0) {
|
||||
// 设置多个 cookie 到原生 http.ServerResponse
|
||||
ctx.res.setHeader('Set-Cookie', setCookieHeaders);
|
||||
} else {
|
||||
// 兼容旧版本,使用 get 方法
|
||||
const setCookieHeader = res.headers.get('set-cookie');
|
||||
if (setCookieHeader) {
|
||||
ctx.res.setHeader('Set-Cookie', setCookieHeader);
|
||||
}
|
||||
}
|
||||
|
||||
const responseData = await res.json();
|
||||
console.debug('admin login response', { res: responseData });
|
||||
if (responseData.code !== 200) {
|
||||
console.debug('admin login failed', { res: responseData });
|
||||
return ctx.throw(401, 'login failed');
|
||||
}
|
||||
const me = await assistantConfig.query.post({
|
||||
path: 'user',
|
||||
key: 'me',
|
||||
token: responseData.data.token,
|
||||
})
|
||||
if (me.code === 200) {
|
||||
const loginUser = me.data.username;
|
||||
if (auth.username && loginUser !== auth.username) {
|
||||
return ctx.throw(403, 'login user is not admin user');
|
||||
}
|
||||
if (!auth.username) {
|
||||
// 初始管理员账号
|
||||
auth.username = loginUser;
|
||||
if (!auth.share) {
|
||||
auth.share = 'protected';
|
||||
}
|
||||
assistantConfig.setConfig({ auth });
|
||||
console.log('set first admin user', { username: loginUser });
|
||||
}
|
||||
// 保存配置
|
||||
}
|
||||
|
||||
ctx.body = responseData.data;
|
||||
}).addTo(app);
|
||||
|
||||
app.route({
|
||||
path: 'user',
|
||||
key: 'me'
|
||||
}).define(async (ctx) => {
|
||||
const token = ctx.query.token;
|
||||
const res = await assistantConfig.query.post({
|
||||
path: 'user',
|
||||
key: 'me',
|
||||
token,
|
||||
});
|
||||
ctx.forward(res);
|
||||
}).addTo(app);
|
||||
@@ -1,15 +1,18 @@
|
||||
import { useContextKey } from '@kevisual/context';
|
||||
import { app, assistantConfig } from './app.ts';
|
||||
import { proxyRoute, proxyWs } from './services/proxy/proxy-page-index.ts';
|
||||
import './routes/index.ts';
|
||||
import './routes-simple/index.ts';
|
||||
|
||||
import getPort, { portNumbers } from 'get-port';
|
||||
import { program } from 'commander';
|
||||
import { spawnSync } from 'node:child_process';
|
||||
import path from 'node:path'
|
||||
import chalk from 'chalk';
|
||||
import { AssistantApp } from './lib.ts';
|
||||
import { AssistantApp, checkFileExists } from './lib.ts';
|
||||
import { getBunPath } from './module/get-bun-path.ts';
|
||||
export const runServer = async (port?: number, listenPath = '127.0.0.1') => {
|
||||
import { qwenAsr } from './services/asr/qwen-asr.ts';
|
||||
export const runServer = async (port: number = 51515, listenPath = '127.0.0.1') => {
|
||||
let _port: number | undefined;
|
||||
if (port) {
|
||||
_port = await getPort({ port });
|
||||
@@ -20,7 +23,7 @@ export const runServer = async (port?: number, listenPath = '127.0.0.1') => {
|
||||
}
|
||||
if (!_port) {
|
||||
// 检车端口可用性
|
||||
const isPortAvailable = await getPort({ port: portNumbers(51015, 52000) });
|
||||
const isPortAvailable = await getPort({ port: portNumbers(51515, 52000) });
|
||||
if (!isPortAvailable) {
|
||||
console.log(`Port ${isPortAvailable} is not available`);
|
||||
process.exit(1);
|
||||
@@ -34,18 +37,29 @@ export const runServer = async (port?: number, listenPath = '127.0.0.1') => {
|
||||
});
|
||||
} else {
|
||||
app.listen(_port, listenPath, () => {
|
||||
const protocol = assistantConfig.getHttps().protocol;
|
||||
console.log(`Server is running on ${protocol}://${listenPath}:${_port}`);
|
||||
let showListenPath = listenPath;
|
||||
if (listenPath === '::') {
|
||||
showListenPath = 'localhost';
|
||||
}
|
||||
console.log(`Server is running on ${'http'}://${showListenPath}:${_port}`);
|
||||
});
|
||||
}
|
||||
app.server.on(proxyRoute);
|
||||
proxyWs();
|
||||
const manager = new AssistantApp(assistantConfig, app);
|
||||
app.server.on([{
|
||||
id: 'handle-all',
|
||||
func: proxyRoute as any,
|
||||
},
|
||||
...proxyWs(),
|
||||
qwenAsr,
|
||||
]);
|
||||
const manager = useContextKey('manager', new AssistantApp(assistantConfig, app));
|
||||
setTimeout(() => {
|
||||
manager.load({ runtime: 'client' }).then(() => {
|
||||
console.log('Assistant App Loaded');
|
||||
});
|
||||
manager.initRemoteApp()
|
||||
manager.initRouterApp()
|
||||
}, 1000);
|
||||
|
||||
return {
|
||||
app,
|
||||
port: _port,
|
||||
@@ -57,6 +71,8 @@ program
|
||||
.option('-n, --name <name>', '服务名称', 'assistant-server')
|
||||
.option('-p, --port <port>', '服务端口')
|
||||
.option('-s, --start', '是否启动服务')
|
||||
.option('-r, --root <root>', 'assistant app的根目录路径')
|
||||
.option('-i, --input <input>', '启动的输入文件,例如/workspace/src/main.ts')
|
||||
.option('-e, --interpreter <interpreter>', '指定使用的解释器', 'bun')
|
||||
.action(async (options) => {
|
||||
// console.log('当前执行路径:', execPath, inte);
|
||||
@@ -83,11 +99,16 @@ program
|
||||
|
||||
// 构建 pm2 命令字符串
|
||||
let pm2Command = `pm2 start ${escapePath(runPath)} --interpreter ${escapePath(interpreterPath)} --name ${name} -- -s`;
|
||||
|
||||
|
||||
if (port) {
|
||||
pm2Command += ` -p ${port}`;
|
||||
}
|
||||
|
||||
if (options.root) {
|
||||
pm2Command += ` --root ${options.root}`;
|
||||
}
|
||||
if (options.input) {
|
||||
pm2Command += ` --input ${options.input}`;
|
||||
}
|
||||
console.log(chalk.gray('执行命令:'), pm2Command);
|
||||
console.log(chalk.gray('脚本路径:'), runPath);
|
||||
|
||||
@@ -104,7 +125,7 @@ program
|
||||
shell: true,
|
||||
windowsHide: false,
|
||||
});
|
||||
|
||||
|
||||
if (result.error) {
|
||||
console.error(chalk.red('Error starting server:'), result.error.message);
|
||||
console.log(chalk.yellow('\n提示: 请检查:'));
|
||||
@@ -113,14 +134,14 @@ program
|
||||
console.log(' 3. 尝试手动执行:', pm2Command);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
|
||||
if (result.status !== 0) {
|
||||
console.error(chalk.red(`PM2 exited with code ${result.status}`));
|
||||
console.log(chalk.yellow('\n查看详细日志:'), `pm2 logs ${name}`);
|
||||
console.log(chalk.yellow('查看进程状态:'), 'pm2 list');
|
||||
process.exit(result.status || 1);
|
||||
}
|
||||
|
||||
|
||||
console.log(chalk.green('✓ 以守护进程方式运行'));
|
||||
console.log(chalk.gray('查看日志:'), `pm2 logs ${name}`);
|
||||
} catch (error) {
|
||||
@@ -131,9 +152,15 @@ program
|
||||
} else if (options.start) {
|
||||
console.log('启动服务', chalk.green(assistantConfig.configDir));
|
||||
const config = assistantConfig.getCacheAssistantConfig();
|
||||
const listenPort = options.port || config?.server?.port;
|
||||
const listenPort = parseInt(options.port || config?.server?.port);
|
||||
const listenPath = config?.server?.path || '::';
|
||||
const server = await runServer(listenPort, listenPath);
|
||||
if (options.input) {
|
||||
const _input = path.resolve(options.input);
|
||||
if (checkFileExists(_input)) {
|
||||
await import(_input);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
console.log('请使用 -s 参数启动服务');
|
||||
}
|
||||
|
||||
25
assistant/src/services/asr/asr-manager.ts
Normal file
25
assistant/src/services/asr/asr-manager.ts
Normal file
@@ -0,0 +1,25 @@
|
||||
|
||||
import { QwenAsrRelatime } from "@kevisual/video-tools/src/asr/index.ts";
|
||||
|
||||
export class AsrManger {
|
||||
map: Map<string, QwenAsrRelatime>;
|
||||
constructor() {
|
||||
this.map = new Map();
|
||||
}
|
||||
|
||||
getAsr(id: string) {
|
||||
const asr = this.map.get(id);
|
||||
return asr;
|
||||
}
|
||||
|
||||
setAsr(id: string, asr: QwenAsrRelatime) {
|
||||
this.map.set(id, asr);
|
||||
return asr;
|
||||
}
|
||||
|
||||
deleteAsr(id: string) {
|
||||
this.map.delete(id);
|
||||
}
|
||||
}
|
||||
|
||||
export const arrManager = new AsrManger();
|
||||
110
assistant/src/services/asr/qwen-asr.ts
Normal file
110
assistant/src/services/asr/qwen-asr.ts
Normal file
@@ -0,0 +1,110 @@
|
||||
import { QwenAsrRelatime } from "@kevisual/video-tools/src/asr/index.ts";
|
||||
|
||||
import { Listener, WebSocketListenerFun, WebSocketReq } from "@kevisual/router";
|
||||
import { callText } from "@/routes/ha-api/ha.ts";
|
||||
import { assistantConfig } from "@/app.ts";
|
||||
|
||||
const func: WebSocketListenerFun = async (req: WebSocketReq<{ asr: QwenAsrRelatime, msgId: string, startTime?: number, loading?: boolean }>, res) => {
|
||||
const { ws, emitter, id, data } = req;
|
||||
let asr = ws.data.asr;
|
||||
|
||||
if (!id) {
|
||||
ws.send(JSON.stringify({ type: 'error', message: 'not found id' }));
|
||||
ws.close();
|
||||
return;
|
||||
}
|
||||
if (!asr) {
|
||||
if (ws.data.loading) return;
|
||||
ws.data.loading = true;
|
||||
|
||||
const confg = assistantConfig.getConfig();
|
||||
const asrConfig = confg?.asr;
|
||||
if (!asrConfig?.enabled) {
|
||||
ws.send(JSON.stringify({ type: 'error', message: 'asr服务未启用' }));
|
||||
ws.close();
|
||||
return;
|
||||
}
|
||||
const token = asrConfig?.token;
|
||||
if (!token) {
|
||||
ws.send(JSON.stringify({ type: 'error', message: 'asr服务未配置token' }));
|
||||
ws.close();
|
||||
return;
|
||||
}
|
||||
const onConnect = () => {
|
||||
const asr = ws.data.asr as QwenAsrRelatime;
|
||||
ws.send(JSON.stringify({ type: 'asr', code: 200, message: 'asr服务已连接', time: Date.now() }));
|
||||
if (!asr) return;
|
||||
asr.emitter.on('message', (message) => {
|
||||
// console.log('ASR message', message);
|
||||
});
|
||||
asr.emitter.on('partial', (message) => {
|
||||
// console.log('ASR message', message);
|
||||
let msgId = ws.data.msgId || Math.random().toString(36).substring(2, 10);
|
||||
ws.data.msgId = msgId;
|
||||
ws.send(JSON.stringify({
|
||||
type: 'partial',
|
||||
msgId: msgId,
|
||||
time: Date.now(),
|
||||
text: message?.text,
|
||||
raw: message?.raw,
|
||||
}));
|
||||
});
|
||||
asr.emitter.on('result', async ({ text, raw }) => {
|
||||
let msgId = ws.data.msgId;
|
||||
ws.data.msgId = Math.random().toString(36).substring(2, 10);
|
||||
const endTime = Date.now();
|
||||
console.log('cost time', ws.data.startTime ? (endTime - ws.data.startTime) : 0);
|
||||
ws.send(JSON.stringify({
|
||||
type: 'result',
|
||||
msgId: msgId,
|
||||
time: Date.now(),
|
||||
text,
|
||||
}));
|
||||
if (!text) return;
|
||||
await callText(text);
|
||||
console.log('toogle light time', Date.now() - endTime);
|
||||
});
|
||||
asr.start();
|
||||
}
|
||||
// 第一次请求
|
||||
asr = new QwenAsrRelatime({
|
||||
token,
|
||||
emitter,
|
||||
onConnect,
|
||||
})
|
||||
ws.data.asr = asr;
|
||||
ws.data.loading = false;
|
||||
emitter.on('close--' + id, () => {
|
||||
console.log('ASR websocket 关闭, 释放资源');
|
||||
asr?.close?.();
|
||||
});
|
||||
}
|
||||
const isConnected = await asr.checkConnected();
|
||||
if (!isConnected) return;
|
||||
if (data?.type === 'blankVoice') {
|
||||
asr.sendBlank();
|
||||
console.log('ASR receive data', 'blank voice');
|
||||
} else if (data?.voice) {
|
||||
if (!data?.isRelatime) {
|
||||
console.log('ASR receive data', 'has voice', !!data?.voice, data?.isRelatime);
|
||||
const time = data?.time || 0;
|
||||
console.log('receiveDelay', Date.now() - time);
|
||||
}
|
||||
const isBrowserFormat = data.format === 'float32';
|
||||
|
||||
let voice: Buffer;
|
||||
if (isBrowserFormat) {
|
||||
voice = await asr.fixBrowerBuffer(data.voice);
|
||||
} else {
|
||||
voice = Buffer.from(data.voice, 'base64');
|
||||
}
|
||||
ws.data.startTime = Date.now();
|
||||
asr.sendBuffer(voice);
|
||||
}
|
||||
}
|
||||
export const qwenAsr: Listener = {
|
||||
id: 'qwen-asr',
|
||||
path: '/ws/asr',
|
||||
io: true,
|
||||
func
|
||||
}
|
||||
@@ -2,38 +2,46 @@ import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { checkFileExists, AssistantConfig, AssistantConfigData, parseHomeArg, parseHelpArg } from '@/module/assistant/index.ts';
|
||||
import { chalk } from '@/module/chalk.ts';
|
||||
import { HttpsPem } from '@/module/assistant/https/sign.ts';
|
||||
import { Query } from '@kevisual/query/query';
|
||||
import { installDeps } from '@/module/npm-install.ts'
|
||||
export { parseHomeArg, parseHelpArg };
|
||||
export type AssistantInitOptions = {
|
||||
path?: string;
|
||||
init?: boolean;
|
||||
initWorkspace?: boolean;
|
||||
};
|
||||
const randomId = () => Math.random().toString(36).substring(2, 8);
|
||||
/**
|
||||
* 助手初始化类
|
||||
* @class AssistantInit
|
||||
*/
|
||||
export class AssistantInit extends AssistantConfig {
|
||||
#query: Query
|
||||
initWorkspace: boolean = false;
|
||||
constructor(opts?: AssistantInitOptions) {
|
||||
const configDir = opts?.path || process.cwd();
|
||||
super({
|
||||
configDir,
|
||||
init: false,
|
||||
});
|
||||
this.initWorkspace = opts?.initWorkspace ?? true;
|
||||
if (opts?.init) {
|
||||
this.init();
|
||||
}
|
||||
}
|
||||
|
||||
async init() {
|
||||
async init(configDir?: string) {
|
||||
if (configDir) {
|
||||
this.configDir = configDir;
|
||||
}
|
||||
// 1. 检查助手路径是否存在
|
||||
if (!this.checkConfigPath()) {
|
||||
super.init(configDir);
|
||||
if (!this.initWorkspace) { return }
|
||||
console.log(chalk.blue('助手路径不存在,正在创建...'));
|
||||
super.init();
|
||||
} else {
|
||||
super.init();
|
||||
super.init(configDir);
|
||||
if (!this.initWorkspace) { return }
|
||||
const assistantConfig = this;
|
||||
console.log(chalk.yellow('助手路径已存在'), chalk.green(assistantConfig.configDir));
|
||||
}
|
||||
@@ -41,6 +49,7 @@ export class AssistantInit extends AssistantConfig {
|
||||
this.createEnvConfig();
|
||||
this.createOtherConfig();
|
||||
this.initPnpm();
|
||||
this.initIgnore();
|
||||
}
|
||||
get query() {
|
||||
if (!this.#query) {
|
||||
@@ -48,9 +57,12 @@ export class AssistantInit extends AssistantConfig {
|
||||
}
|
||||
return this.#query;
|
||||
}
|
||||
get baseURL() {
|
||||
return `${this.getConfig()?.app?.url || 'https://kevisual.cn'}/api/router`;
|
||||
}
|
||||
setQuery(query?: Query) {
|
||||
this.#query = query || new Query({
|
||||
url: `${this.getConfig()?.pageApi || 'https://kevisual.cn'}/api/router`,
|
||||
url: `${this.getConfig()?.app?.url || 'https://kevisual.cn'}/api/router`,
|
||||
});
|
||||
}
|
||||
checkConfigPath() {
|
||||
@@ -72,14 +84,6 @@ export class AssistantInit extends AssistantConfig {
|
||||
fs.writeFileSync(appsConfig, JSON.stringify({ description: 'apps manager.', list: [] }));
|
||||
console.log(chalk.green('助手应用配置文件 apps.json 创建成功'));
|
||||
}
|
||||
// create pem dir //
|
||||
const pemDir = path.join(this.configPath?.configDir, 'pem');
|
||||
const httpsPem = new HttpsPem(this);
|
||||
if (httpsPem.isHttps) {
|
||||
if (!checkFileExists(pemDir)) {
|
||||
console.log(chalk.green('助手证书目录创建成功'));
|
||||
}
|
||||
}
|
||||
}
|
||||
createAssistantConfig() {
|
||||
const assistantPath = this.configPath?.configPath;
|
||||
@@ -87,6 +91,16 @@ export class AssistantInit extends AssistantConfig {
|
||||
if (!checkFileExists(assistantPath, true)) {
|
||||
this.setConfig(this.getDefaultInitAssistantConfig());
|
||||
console.log(chalk.green('助手配置文件assistant-config.json创建成功'));
|
||||
} else {
|
||||
const config = this.getConfig();
|
||||
if (!config?.app?.id) {
|
||||
if (!config.app) {
|
||||
config.app = {};
|
||||
}
|
||||
config.app.id = randomId();
|
||||
this.setConfig(config);
|
||||
console.log(chalk.green('助手配置文件assistant-config.json更新成功'));
|
||||
}
|
||||
}
|
||||
}
|
||||
initPnpm() {
|
||||
@@ -114,32 +128,38 @@ export class AssistantInit extends AssistantConfig {
|
||||
"description": "assistant-app package pnpm, node pkgs projects",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"start": "pm2 start apps/root/code-center/app.mjs --name root/code-center",
|
||||
"proxy": "pm2 start apps/root/page-proxy/app.mjs --name root/page-proxy"
|
||||
"start": "pm2 start apps/code-center/dist/app.mjs --name code-center",
|
||||
"proxy": "pm2 start apps/page-proxy/dist/app.mjs --name page-proxy",
|
||||
"preview": "pnpm i && ASSISTANT_CONFIG_DIR=/workspace asst server -s -p 8686"
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@kevisual/router": "latest",
|
||||
"@kevisual/use-config": "latest",
|
||||
"@kevisual/query": "latest",
|
||||
"ioredis": "latest",
|
||||
"minio": "latest",
|
||||
"pg": "latest",
|
||||
"pm2": "latest",
|
||||
"sequelize": "latest",
|
||||
"crypto-js": "latest",
|
||||
"better-sqlite3": "latest",
|
||||
"unstorage": "latest",
|
||||
"dayjs": "latest",
|
||||
"es-toolkit": "latest",
|
||||
"node-cron": "latest",
|
||||
"dotenv": "latest"
|
||||
"@aws-sdk/client-s3": "^3.975.0",
|
||||
"@kevisual/oss": "^0.0.16",
|
||||
"@kevisual/query": "^0.0.38",
|
||||
"eventemitter3": "^5.0.4",
|
||||
"@kevisual/router": "^0.0.62",
|
||||
"@kevisual/use-config": "^1.0.28",
|
||||
"ioredis": "^5.9.2",
|
||||
"minio": "^8.0.6",
|
||||
"pg": "^8.17.2",
|
||||
"pm2": "^6.0.14",
|
||||
"sequelize": "^6.37.7",
|
||||
"crypto-js": "^4.2.0",
|
||||
"better-sqlite3": "^12.6.2",
|
||||
"unstorage": "^1.17.4",
|
||||
"dayjs": "^1.11.19",
|
||||
"es-toolkit": "^1.44.0",
|
||||
"node-cron": "^4.2.1",
|
||||
"dotenv": "^17.2.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "latest",
|
||||
"@types/crypto-js": "latest"
|
||||
"@kevisual/types": "^0.0.12",
|
||||
"@types/bun": "^1.3.6",
|
||||
"@types/crypto-js": "^4.2.2",
|
||||
"@types/node": "^25.0.10"
|
||||
}
|
||||
}
|
||||
`,
|
||||
@@ -153,27 +173,54 @@ export class AssistantInit extends AssistantConfig {
|
||||
create,
|
||||
};
|
||||
}
|
||||
initIgnore() {
|
||||
const gitignorePath = path.join(this.configDir, '.gitignore');
|
||||
let content = '';
|
||||
if (checkFileExists(gitignorePath, true)) {
|
||||
content = fs.readFileSync(gitignorePath, 'utf-8');
|
||||
}
|
||||
const ignoreLines = [
|
||||
'node_modules',
|
||||
'.DS_Store',
|
||||
'dist',
|
||||
'pack-dist',
|
||||
'cache-file',
|
||||
'build',
|
||||
'apps/**/node_modules/',
|
||||
'pages/**/node_modules/',
|
||||
'.env',
|
||||
'!.env*development',
|
||||
'.pnpm-store',
|
||||
'.vite',
|
||||
'.astro'
|
||||
];
|
||||
let updated = false;
|
||||
ignoreLines.forEach((line) => {
|
||||
if (!content.includes(line)) {
|
||||
content += `\n${line}`;
|
||||
updated = true;
|
||||
}
|
||||
});
|
||||
if (updated) {
|
||||
fs.writeFileSync(gitignorePath, content.trim() + '\n');
|
||||
console.log(chalk.green('.gitignore 文件更新成功'));
|
||||
}
|
||||
}
|
||||
protected getDefaultInitAssistantConfig() {
|
||||
const id = randomId();
|
||||
return {
|
||||
app: {
|
||||
url: 'https://kevisual.cn',
|
||||
id,
|
||||
},
|
||||
description: '助手配置文件',
|
||||
home: '/root/center',
|
||||
docs: "https://kevisual.cn/root/cli/docs/",
|
||||
home: '/root/home',
|
||||
proxy: [],
|
||||
apiProxyList: [],
|
||||
share: {
|
||||
enabled: false,
|
||||
name: 'abc',
|
||||
url: 'https://kevisual.cn/ws/proxy',
|
||||
},
|
||||
watch: {
|
||||
enabled: true,
|
||||
},
|
||||
} as AssistantConfigData;
|
||||
}
|
||||
getHttps() {
|
||||
const https = this.getConfig()?.https || {};
|
||||
return {
|
||||
https,
|
||||
protocol: https?.type === 'https' ? 'https' : 'http',
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,31 +4,37 @@
|
||||
"description": "assistant-app package pnpm, node pkgs projects",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"start": "pm2 start apps/root/code-center/app.mjs --name root/code-center",
|
||||
"proxy": "pm2 start apps/root/page-proxy/app.mjs --name root/page-proxy"
|
||||
"start": "pm2 start apps/code-center/dist/app.mjs --name code-center",
|
||||
"proxy": "pm2 start apps/page-proxy/dist/app.mjs --name page-proxy",
|
||||
"preview": "pnpm i && ASSISTANT_CONFIG_DIR=/workspace asst server -s -p 8686"
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@kevisual/router": "latest",
|
||||
"@kevisual/use-config": "latest",
|
||||
"@kevisual/query": "latest",
|
||||
"ioredis": "latest",
|
||||
"minio": "latest",
|
||||
"pg": "latest",
|
||||
"pm2": "latest",
|
||||
"sequelize": "latest",
|
||||
"crypto-js": "latest",
|
||||
"better-sqlite3": "latest",
|
||||
"unstorage": "latest",
|
||||
"dayjs": "latest",
|
||||
"es-toolkit": "latest",
|
||||
"node-cron": "latest",
|
||||
"dotenv": "latest"
|
||||
"@aws-sdk/client-s3": "^3.975.0",
|
||||
"@kevisual/oss": "^0.0.16",
|
||||
"@kevisual/query": "^0.0.38",
|
||||
"eventemitter3": "^5.0.4",
|
||||
"@kevisual/router": "^0.0.62",
|
||||
"@kevisual/use-config": "^1.0.28",
|
||||
"ioredis": "^5.9.2",
|
||||
"minio": "^8.0.6",
|
||||
"pg": "^8.17.2",
|
||||
"pm2": "^6.0.14",
|
||||
"sequelize": "^6.37.7",
|
||||
"crypto-js": "^4.2.0",
|
||||
"better-sqlite3": "^12.6.2",
|
||||
"unstorage": "^1.17.4",
|
||||
"dayjs": "^1.11.19",
|
||||
"es-toolkit": "^1.44.0",
|
||||
"node-cron": "^4.2.1",
|
||||
"dotenv": "^17.2.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "latest",
|
||||
"@types/crypto-js": "latest"
|
||||
"@kevisual/types": "^0.0.12",
|
||||
"@types/bun": "^1.3.6",
|
||||
"@types/crypto-js": "^4.2.2",
|
||||
"@types/node": "^25.0.10"
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,101 @@
|
||||
import { fileProxy, httpProxy, createApiProxy, wsProxy } from '@/module/assistant/index.ts';
|
||||
import { createApiProxy, ProxyInfo, proxy } from '@/module/assistant/index.ts';
|
||||
import http from 'node:http';
|
||||
import { LocalProxy } from './local-proxy.ts';
|
||||
import { assistantConfig, app } from '@/app.ts';
|
||||
import { assistantConfig, simpleRouter } from '@/app.ts';
|
||||
import { log, logger } from '@/module/logger.ts';
|
||||
import { getToken } from '@/module/http-token.ts';
|
||||
import { getTokenUserCache } from '@/routes/index.ts';
|
||||
import type { WebSocketListenerFun } from "@kevisual/router";
|
||||
import WebSocket from 'ws';
|
||||
import { renderNoAuthAndLogin } from '@/module/assistant/html/login.ts';
|
||||
const localProxy = new LocalProxy({});
|
||||
localProxy.initFromAssistantConfig(assistantConfig);
|
||||
|
||||
export const proxyRoute = async (req: http.IncomingMessage, res: http.ServerResponse) => {
|
||||
const isOpenPath = (pathname: string): boolean => {
|
||||
const openPaths = ['/root/home', '/root/cli', '/root/login'];
|
||||
for (const openPath of openPaths) {
|
||||
if (pathname.startsWith(openPath)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
/**
|
||||
* 过滤访问的资源,允许谁访问
|
||||
* @param req
|
||||
* @param res
|
||||
* @returns
|
||||
*/
|
||||
const authFilter = async (req: http.IncomingMessage, res: http.ServerResponse) => {
|
||||
const _assistantConfig = assistantConfig.getCacheAssistantConfig();
|
||||
const auth = _assistantConfig?.auth || {};
|
||||
const share = auth.share || 'protected';
|
||||
const noAdmin = !auth.username;
|
||||
if (noAdmin) return { code: 200, message: '没有管理员, 直接放过, 让管理登录和自己设置' };
|
||||
const admin = auth.username;
|
||||
const admins = auth.admin || [];
|
||||
if (admin) {
|
||||
admins.push(admin);
|
||||
}
|
||||
const url = new URL(req.url, 'http://localhost');
|
||||
const pathname = decodeURIComponent(url.pathname);
|
||||
if (pathname === '/' && _assistantConfig?.home) {
|
||||
res.writeHead(302, { Location: `${_assistantConfig?.home}/` });
|
||||
// 放开 /
|
||||
if (pathname === '/' || pathname === '/favicon.ico') {
|
||||
return { code: 200, message: '允许访问根路径' };
|
||||
}
|
||||
// 放开首页
|
||||
if (pathname.startsWith('/root/home') || pathname === '/root/cli/docs/') {
|
||||
return { code: 200, message: '允许访问首页' };
|
||||
}
|
||||
// 放开api, 以 /api, /v1, /client, /serve 开头的请求
|
||||
const openApiPaths = ['/api', '/v1', '/client', '/serve', '/proxy', '/root'];
|
||||
for (const openPath of openApiPaths) {
|
||||
if (pathname.startsWith(openPath)) {
|
||||
return { code: 200, message: '允许公共访问模块' };
|
||||
}
|
||||
}
|
||||
if (share === 'public') {
|
||||
return { code: 200, message: '公开模式允许访问' };
|
||||
}
|
||||
const { token } = await getToken(req)
|
||||
if (!token) {
|
||||
// no token 转到登录页面
|
||||
res.writeHead(302, { Location: `/root/home/` });
|
||||
res.end();
|
||||
return { code: 500, message: '未登录' };
|
||||
}
|
||||
const tokenUser = await getTokenUserCache(token);
|
||||
if (share === 'protected' && tokenUser?.code === 200) {
|
||||
return { code: 200, message: '受保护模式已登录允许访问' };
|
||||
}
|
||||
if (share === 'private') {
|
||||
if (tokenUser?.code === 200) {
|
||||
const username = tokenUser?.data?.username;
|
||||
if (admins.includes(username)) {
|
||||
return { code: 200, message: '私有模式管理员允许访问' };
|
||||
}
|
||||
}
|
||||
}
|
||||
return { code: 500, message: '没有权限访问' };
|
||||
}
|
||||
export const proxyRoute = async (req: http.IncomingMessage, res: http.ServerResponse) => {
|
||||
const _assistantConfig = assistantConfig.getCacheAssistantConfig();
|
||||
const home = _assistantConfig?.home || '/root/home';
|
||||
const auth = _assistantConfig?.auth || {};
|
||||
let noAdmin = !auth.username;
|
||||
|
||||
const toSetting = () => {
|
||||
res.writeHead(302, { Location: `/root/cli/setting/` });
|
||||
res.end();
|
||||
return true;
|
||||
}
|
||||
const url = new URL(req.url, 'http://localhost');
|
||||
const pathname = decodeURIComponent(url.pathname);
|
||||
if (pathname === '/') {
|
||||
if (noAdmin) {
|
||||
return toSetting();
|
||||
}
|
||||
res.writeHead(302, { Location: `${home}/` });
|
||||
return res.end();
|
||||
}
|
||||
if (pathname.startsWith('/favicon.ico')) {
|
||||
@@ -19,22 +103,55 @@ export const proxyRoute = async (req: http.IncomingMessage, res: http.ServerResp
|
||||
res.end('Not Found Favicon');
|
||||
return;
|
||||
}
|
||||
if (pathname.startsWith('/client/upload')) {
|
||||
simpleRouter.parse(req, res);
|
||||
return;
|
||||
}
|
||||
if (pathname.startsWith('/client')) {
|
||||
logger.info('url', { url: req.url });
|
||||
console.debug('handle by router');
|
||||
logger.debug('handle by router', { url: req.url });
|
||||
return;
|
||||
}
|
||||
if (pathname.startsWith('/router') || pathname.startsWith('/opencode')) {
|
||||
logger.debug('handle by router (opencode/router)', { url: req.url });
|
||||
return;
|
||||
}
|
||||
// client, api, v1, serve 开头的拦截
|
||||
const apiProxyList = _assistantConfig?.apiProxyList || [];
|
||||
const defaultApiProxy = createApiProxy(_assistantConfig?.pageApi || 'https://kevisual.cn');
|
||||
const apiBackendProxy = [...apiProxyList, ...defaultApiProxy].find((item) => pathname.startsWith(item.path));
|
||||
if (apiBackendProxy) {
|
||||
log.debug('apiBackendProxy', { apiBackendProxy, url: req.url });
|
||||
return httpProxy(req, res, {
|
||||
path: apiBackendProxy.path,
|
||||
target: apiBackendProxy.target,
|
||||
const apiProxy = _assistantConfig?.api?.proxy || [];
|
||||
const defaultApiProxy = createApiProxy(_assistantConfig?.app?.url || 'https://kevisual.cn');
|
||||
const allProxy = [...apiProxy, ...defaultApiProxy];
|
||||
const apiBackendProxy = allProxy.find((item) => pathname.startsWith(item.path));
|
||||
const proxyFn = async (req: http.IncomingMessage, res: http.ServerResponse, proxyApi: ProxyInfo) => {
|
||||
log.debug('proxyApi', { proxyApi, url: req.url });
|
||||
// 设置 CORS 头
|
||||
// res.setHeader('Access-Control-Allow-Origin', '*');
|
||||
// res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
|
||||
// res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization, X-Requested-With');
|
||||
if (proxyApi.s3?.id) {
|
||||
const storage = _assistantConfig?.storage || []
|
||||
const storageConfig = storage.find((item) => item.id === proxyApi.s3?.id);
|
||||
proxyApi.s3 = {
|
||||
...storageConfig,
|
||||
...proxyApi.s3,
|
||||
}
|
||||
}
|
||||
if (proxyApi.file?.id) {
|
||||
const storage = _assistantConfig?.storage || []
|
||||
const storageConfig = storage.find((item) => item.id === proxyApi.file?.id);
|
||||
proxyApi.file = {
|
||||
...storageConfig,
|
||||
...proxyApi.file,
|
||||
}
|
||||
}
|
||||
return proxy(req, res, {
|
||||
path: proxyApi.path,
|
||||
target: proxyApi.target,
|
||||
...proxyApi,
|
||||
});
|
||||
}
|
||||
if (apiBackendProxy) {
|
||||
return proxyFn(req, res, apiBackendProxy);
|
||||
}
|
||||
logger.debug('proxyRoute handle by router', { url: req.url }, noAdmin);
|
||||
const urls = pathname.split('/');
|
||||
const [_, _user, _app] = urls;
|
||||
if (!_app) {
|
||||
@@ -42,6 +159,11 @@ export const proxyRoute = async (req: http.IncomingMessage, res: http.ServerResp
|
||||
res.end('Not Found Proxy');
|
||||
return;
|
||||
}
|
||||
const isOpen = isOpenPath(pathname)
|
||||
logger.debug('proxyRoute', { _user, _app, pathname, noAdmin, isOpen });
|
||||
if (noAdmin && !isOpen) {
|
||||
return toSetting();
|
||||
}
|
||||
if (_app && urls.length === 3) {
|
||||
// 重定向到
|
||||
res.writeHead(302, { Location: `${req.url}/` });
|
||||
@@ -49,52 +171,115 @@ export const proxyRoute = async (req: http.IncomingMessage, res: http.ServerResp
|
||||
}
|
||||
const proxyApiList = _assistantConfig?.proxy || [];
|
||||
const proxyApi = proxyApiList.find((item) => pathname.startsWith(item.path));
|
||||
if (proxyApi && proxyApi.type === 'file') {
|
||||
log.debug('proxyApi', { proxyApi, pathname });
|
||||
const _indexPath = proxyApi.indexPath || `${_user}/${_app}/index.html`;
|
||||
const _rootPath = proxyApi.rootPath;
|
||||
if (!_rootPath) {
|
||||
log.error('Not Found rootPath', { proxyApi, pathname });
|
||||
return res.end(`Not Found [${proxyApi.path}] rootPath`);
|
||||
}
|
||||
return fileProxy(req, res, {
|
||||
path: proxyApi.path, // 代理路径, 比如/root/center
|
||||
rootPath: proxyApi.rootPath,
|
||||
...proxyApi,
|
||||
indexPath: _indexPath, // 首页路径
|
||||
});
|
||||
if (proxyApi) {
|
||||
logger.debug('proxyPage', { proxyApi, pathname });
|
||||
return proxyFn(req, res, proxyApi);
|
||||
}
|
||||
const filter = await authFilter(req, res);
|
||||
if (filter.code !== 200) {
|
||||
logger.debug('auth filter deny', filter);
|
||||
res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
|
||||
// TODO: 这里可以做成可配置的登录页面
|
||||
return res.end(renderNoAuthAndLogin('Not Authorized Proxy'));
|
||||
}
|
||||
const localProxyProxyList = localProxy.getLocalProxyList();
|
||||
const localProxyProxy = localProxyProxyList.find((item) => pathname.startsWith(item.path));
|
||||
if (localProxyProxy) {
|
||||
log.log('localProxyProxy', { localProxyProxy, url: req.url });
|
||||
return fileProxy(req, res, {
|
||||
logger.debug('localProxyProxy', { localProxyProxy, url: req.url });
|
||||
return proxyFn(req, res, {
|
||||
path: localProxyProxy.path,
|
||||
rootPath: localProxy.pagesDir,
|
||||
indexPath: localProxyProxy.indexPath,
|
||||
"type": 'file',
|
||||
file: {
|
||||
rootPath: localProxy.pagesDir,
|
||||
indexPath: localProxyProxy.file.indexPath,
|
||||
}
|
||||
});
|
||||
}
|
||||
const creatCenterProxy = createApiProxy(_assistantConfig?.pageApi || 'https://kevisual.cn', ['/root', '/' + _user]);
|
||||
const creatCenterProxy = createApiProxy(_assistantConfig?.app?.url || 'https://kevisual.cn', ['/root', '/' + _user]);
|
||||
const centerProxy = creatCenterProxy.find((item) => pathname.startsWith(item.path));
|
||||
if (centerProxy) {
|
||||
return httpProxy(req, res, {
|
||||
return proxyFn(req, res, {
|
||||
path: centerProxy.path,
|
||||
target: centerProxy.target,
|
||||
type: 'http',
|
||||
});
|
||||
}
|
||||
log.debug('handle by router 404', req.url);
|
||||
logger.debug('handle by router 404', req.url);
|
||||
|
||||
res.statusCode = 404;
|
||||
res.end('Not Found Proxy');
|
||||
};
|
||||
|
||||
export const proxyWs = () => {
|
||||
const apiProxyList = assistantConfig.getCacheAssistantConfig()?.apiProxyList || [];
|
||||
const apiProxy = assistantConfig.getCacheAssistantConfig()?.api?.proxy || [];
|
||||
const registry = assistantConfig.getRegistry()
|
||||
const proxy = assistantConfig.getCacheAssistantConfig()?.proxy || [];
|
||||
const proxyApi = [...apiProxyList, ...proxy].filter((item) => item.ws);
|
||||
log.debug('proxyApi ', proxyApi);
|
||||
wsProxy(app.server.server, {
|
||||
apiList: proxyApi,
|
||||
});
|
||||
const proxyApi = [...apiProxy, ...proxy].filter((item) => item.ws);
|
||||
const demoProxy = [
|
||||
{
|
||||
path: '/api/ws/demo',
|
||||
target: 'https://kevisual.xiongxiao.me',
|
||||
pathname: '/api/router',
|
||||
ws: true,
|
||||
}
|
||||
]
|
||||
const pathRouter = proxyApi.find((item) => item.path === '/api/router');
|
||||
if (!pathRouter) {
|
||||
proxyApi.push({
|
||||
path: '/api/router',
|
||||
target: registry || 'https://kevisual.cn',
|
||||
pathname: '/api/router',
|
||||
ws: true,
|
||||
});
|
||||
}
|
||||
return proxyApi.map(createProxyInfo);
|
||||
};
|
||||
export const createProxyInfo = (proxyApiItem: ProxyInfo) => {
|
||||
const func: WebSocketListenerFun = async (req, res) => {
|
||||
const { ws, emitter, id, data } = req;
|
||||
if (!id) {
|
||||
ws.send(JSON.stringify({ type: 'error', message: 'not found id' }));
|
||||
ws.close();
|
||||
return;
|
||||
}
|
||||
// @ts-ignore
|
||||
let _proxySocket = ws.data.proxySocket;
|
||||
if (!_proxySocket) {
|
||||
const _u = new URL(proxyApiItem.path, `${proxyApiItem.target}`);
|
||||
if (proxyApiItem.pathname) {
|
||||
_u.pathname = proxyApiItem.pathname;
|
||||
}
|
||||
const isHttps = _u.protocol === 'https:';
|
||||
const wsProtocol = isHttps ? 'wss' : 'ws';
|
||||
const wsUrl = `${wsProtocol}://${_u.host}${_u.pathname}`;
|
||||
console.log('WebSocket proxy URL', { wsUrl });
|
||||
const proxySocket = new WebSocket(wsUrl);
|
||||
proxySocket.on('open', () => {
|
||||
proxySocket.on('message', (message) => {
|
||||
ws.send(message);
|
||||
});
|
||||
});
|
||||
|
||||
proxySocket.on('error', (err) => {
|
||||
console.error(`WebSocket proxy error: ${err.message}`);
|
||||
});
|
||||
proxySocket.on('close', () => {
|
||||
console.log('WebSocket proxy closed');
|
||||
});
|
||||
emitter.once('close--' + id, () => {
|
||||
console.log('WebSocket client closed');
|
||||
proxySocket?.close?.();
|
||||
});
|
||||
// @ts-ignore
|
||||
ws.data.proxySocket = proxySocket;
|
||||
return;
|
||||
}
|
||||
console.log('ws.data', data);
|
||||
_proxySocket.send(JSON.stringify(data))
|
||||
}
|
||||
return {
|
||||
path: proxyApiItem.path,
|
||||
io: true,
|
||||
func: func
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +1,42 @@
|
||||
import { logger } from '@/module/logger.ts';
|
||||
import { assistantConfig, app } from '../app.ts';
|
||||
import '../routes/index.ts';
|
||||
import { RemoteApp } from '@/module/assistant/remote-app/remote-app.ts';
|
||||
import { RemoteApp } from '@/module/remote-app/remote-app.ts';
|
||||
const main = async () => {
|
||||
assistantConfig.checkMounted();
|
||||
const remoteApp = new RemoteApp({
|
||||
assistantConfig,
|
||||
app,
|
||||
});
|
||||
const connect = await remoteApp.isConnect();
|
||||
if (connect) {
|
||||
console.log('Connected to proxy server');
|
||||
remoteApp.listenProxy();
|
||||
} else {
|
||||
console.log('Not connected to proxy server');
|
||||
const config = assistantConfig?.getConfig();
|
||||
const share = config?.share;
|
||||
if (share && share.enabled !== false) {
|
||||
const token = config?.token;
|
||||
const url = new URL(share.url || 'https://kevisual.cn/ws/proxy');
|
||||
const id = config?.app?.id;
|
||||
if (!id) {
|
||||
console.error('App ID is required for remote app connection.');
|
||||
return;
|
||||
}
|
||||
if (!token) {
|
||||
console.error('Token is required for remote app connection.');
|
||||
return;
|
||||
}
|
||||
const remoteApp = new RemoteApp({
|
||||
url: url.toString(),
|
||||
token,
|
||||
id,
|
||||
app,
|
||||
});
|
||||
const connect = await remoteApp.isConnect();
|
||||
if (connect) {
|
||||
console.log('Connected to proxy server');
|
||||
remoteApp.listenProxy();
|
||||
remoteApp.emitter.on('message', (event) => {
|
||||
const _msg = event.toString();
|
||||
console.log('Received message from remote app:', _msg);
|
||||
});
|
||||
} else {
|
||||
console.log('Not connected to proxy server');
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
main();
|
||||
|
||||
|
||||
178
assistant/src/test/upload-file.ts
Normal file
178
assistant/src/test/upload-file.ts
Normal file
@@ -0,0 +1,178 @@
|
||||
// 使用 fetch 和 FormData 上传文件的示例代码
|
||||
|
||||
// 示例 1: 使用 File 对象上传
|
||||
async function uploadFileUsingFileObject(file: File) {
|
||||
const formData = new FormData();
|
||||
formData.append('file', file);
|
||||
// 可以添加其他字段
|
||||
formData.append('filename', file.name);
|
||||
formData.append('description', '文件描述');
|
||||
formData.append('appKey', 'test');
|
||||
formData.append('version', '1.0.0');
|
||||
|
||||
try {
|
||||
const response = await fetch('http://localhost:51516/client/router', {
|
||||
method: 'POST',
|
||||
body: formData,
|
||||
// 注意:使用 FormData 时不需要手动设置 Content-Type,
|
||||
// 浏览器会自动设置正确的 multipart/form-data 边界
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`上传失败: ${response.status} ${response.statusText}`);
|
||||
}
|
||||
|
||||
const result = await response.json();
|
||||
console.log('上传成功:', result);
|
||||
return result;
|
||||
} catch (error) {
|
||||
console.error('上传出错:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
// 示例 2: 使用 FileList(如 input[type="file"])上传
|
||||
async function uploadFilesUsingFileList(files: FileList) {
|
||||
const formData = new FormData();
|
||||
|
||||
// 多个文件使用相同的字段名
|
||||
for (let i = 0; i < files.length; i++) {
|
||||
formData.append('files', files[i]);
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch('http://localhost:51516/client/router', {
|
||||
method: 'POST',
|
||||
body: formData,
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`上传失败: ${response.status} ${response.statusText}`);
|
||||
}
|
||||
|
||||
const result = await response.json();
|
||||
console.log('上传成功:', result);
|
||||
return result;
|
||||
} catch (error) {
|
||||
console.error('上传出错:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
// 示例 3: 从路径读取文件上传(Node.js 环境,使用 fs 和 Blob)
|
||||
import fs from 'fs';
|
||||
|
||||
async function uploadFileFromPath(fileList: string[]) {
|
||||
|
||||
const formData = new FormData();
|
||||
for (let m of fileList) {
|
||||
const buffer = fs.readFileSync(m);
|
||||
const file = new File([buffer], m.split('/').pop()!, {
|
||||
type: 'application/octet-stream',
|
||||
});
|
||||
formData.append('file', file);
|
||||
}
|
||||
formData.append('appKey', 'test');
|
||||
formData.append('version', '1.0.0');
|
||||
|
||||
let token = 'st_n9ycynd4m7wdyw3lejb8plnkyi62uejd'; // 如果需要身份验证,添加令牌
|
||||
try {
|
||||
const response = await fetch('http://localhost:51516/client/upload' + `?token=${token}`, {
|
||||
method: 'POST',
|
||||
body: formData,
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`上传失败: ${response.status} ${response.statusText}`);
|
||||
}
|
||||
|
||||
const result = await response.json();
|
||||
console.log('上传成功:', JSON.stringify(result, null, 2));
|
||||
return result;
|
||||
} catch (error) {
|
||||
console.error('上传出错:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
uploadFileFromPath(['./src/test/remote-app.ts', './src/test/upload-file.ts']);
|
||||
// 示例 4: 完整的 HTML 使用示例(浏览器环境)
|
||||
/*
|
||||
// HTML
|
||||
// <input type="file" id="fileInput" multiple>
|
||||
// <button onclick="handleUpload()">上传</button>
|
||||
|
||||
async function handleUpload() {
|
||||
const fileInput = document.getElementById('fileInput') as HTMLInputElement;
|
||||
const files = fileInput.files;
|
||||
|
||||
if (!files || files.length === 0) {
|
||||
alert('请选择文件');
|
||||
return;
|
||||
}
|
||||
|
||||
const formData = new FormData();
|
||||
|
||||
for (let i = 0; i < files.length; i++) {
|
||||
formData.append('files', files[i]);
|
||||
}
|
||||
|
||||
// 添加额外数据
|
||||
formData.append('userId', '12345');
|
||||
formData.append('timestamp', Date.now().toString());
|
||||
|
||||
try {
|
||||
const response = await fetch('http://localhost:51516/client/router', {
|
||||
method: 'POST',
|
||||
body: formData,
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`上传失败: ${response.status}`);
|
||||
}
|
||||
|
||||
const result = await response.json();
|
||||
alert('上传成功: ' + JSON.stringify(result));
|
||||
} catch (error) {
|
||||
alert('上传出错: ' + error);
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// 示例 5: 带进度监控的上传(浏览器环境)
|
||||
/*
|
||||
async function uploadWithProgress(file: File, onProgress: (percent: number) => void) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const xhr = new XMLHttpRequest();
|
||||
const formData = new FormData();
|
||||
formData.append('file', file);
|
||||
|
||||
xhr.upload.addEventListener('progress', (e) => {
|
||||
if (e.lengthComputable) {
|
||||
const percent = (e.loaded / e.total) * 100;
|
||||
onProgress(percent);
|
||||
}
|
||||
});
|
||||
|
||||
xhr.addEventListener('load', () => {
|
||||
if (xhr.status === 200) {
|
||||
resolve(JSON.parse(xhr.responseText));
|
||||
} else {
|
||||
reject(new Error(`上传失败: ${xhr.status}`));
|
||||
}
|
||||
});
|
||||
|
||||
xhr.addEventListener('error', () => reject(new Error('网络错误')));
|
||||
xhr.addEventListener('abort', () => reject(new Error('上传被取消')));
|
||||
|
||||
xhr.open('POST', 'http://localhost:51516/client/router');
|
||||
xhr.send(formData);
|
||||
});
|
||||
}
|
||||
|
||||
// 使用
|
||||
// const file = fileInput.files[0];
|
||||
// uploadWithProgress(file, (percent) => {
|
||||
// console.log(`上传进度: ${percent.toFixed(1)}%`);
|
||||
// }).then(result => console.log('完成', result));
|
||||
*/
|
||||
45
assistant/src/test/ws-app.ts
Normal file
45
assistant/src/test/ws-app.ts
Normal file
@@ -0,0 +1,45 @@
|
||||
import { WebSocket } from 'ws';
|
||||
|
||||
const testRouter = () => {
|
||||
// const ws = new WebSocket('ws://121.4.112.18:3005/api/router');
|
||||
// const ws = new WebSocket('wss://kevisual.xiongxiao.me/ws/proxy');
|
||||
// const ws = new WebSocket('wss://kevisual.xiongxiao.me/api/router');
|
||||
|
||||
// const ws = new WebSocket('ws://118.196.32.29:3005/api/router');
|
||||
// const ws = new WebSocket('wss://kevisual.cn/api/router');
|
||||
|
||||
// const ws = new WebSocket('ws://localhost:51515/api/ws/demo?id=12345');
|
||||
const ws = new WebSocket('ws://localhost:51515/api/router?id=12345');
|
||||
console.log('Connecting to WebSocket server...');
|
||||
ws.on('open', () => {
|
||||
console.log('WebSocket connection opened');
|
||||
sendSystemVersion();
|
||||
setTimeout(() => {
|
||||
sendSystemVersion();
|
||||
console.log('第二次发送');
|
||||
}, 3000);
|
||||
});
|
||||
const sendSystemVersion = () => {
|
||||
ws.send(
|
||||
JSON.stringify({
|
||||
"type": "router",
|
||||
"data": {
|
||||
path: 'system',
|
||||
key: 'version'
|
||||
}
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
ws.on('message', (data) => {
|
||||
console.log('Received message from server e:', data.toString());
|
||||
});
|
||||
ws.on('close', () => {
|
||||
console.log('WebSocket connection closed');
|
||||
});
|
||||
ws.on('error', (error) => {
|
||||
console.error('WebSocket error:', error);
|
||||
});
|
||||
}
|
||||
|
||||
testRouter()
|
||||
@@ -14,5 +14,6 @@
|
||||
},
|
||||
"include": [
|
||||
"src/**/*",
|
||||
"agent/**/*"
|
||||
],
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
// @ts-ignore
|
||||
import pkg from './package.json';
|
||||
// bun run src/index.ts --
|
||||
const external = ['bun'];
|
||||
await Bun.build({
|
||||
target: 'node',
|
||||
format: 'esm',
|
||||
@@ -11,9 +12,8 @@ await Bun.build({
|
||||
naming: {
|
||||
entry: 'envision.js',
|
||||
},
|
||||
|
||||
external: external,
|
||||
define: {
|
||||
ENVISION_VERSION: JSON.stringify(pkg.version),
|
||||
},
|
||||
env: 'ENVISION_*',
|
||||
});
|
||||
|
||||
0
cli-center/.env
Normal file
0
cli-center/.env
Normal file
6
cli-center/.gitignore
vendored
Normal file
6
cli-center/.gitignore
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
node_modules
|
||||
.DS_Store
|
||||
|
||||
.astro
|
||||
|
||||
dist
|
||||
44
cli-center/astro.config.mjs
Normal file
44
cli-center/astro.config.mjs
Normal file
@@ -0,0 +1,44 @@
|
||||
import { defineConfig } from 'astro/config';
|
||||
import mdx from '@astrojs/mdx';
|
||||
import react from '@astrojs/react';
|
||||
import sitemap from '@astrojs/sitemap';
|
||||
import pkgs from './package.json';
|
||||
import tailwindcss from '@tailwindcss/vite';
|
||||
import dotenv from 'dotenv';
|
||||
// import vue from '@astrojs/vue';
|
||||
|
||||
dotenv.config();
|
||||
const isDev = process.env.NODE_ENV === 'development';
|
||||
|
||||
let target = process.env.VITE_API_URL || 'http://localhost:51515';
|
||||
const apiProxy = { target: target, changeOrigin: true, ws: true, rewriteWsOrigin: true, secure: false, cookieDomainRewrite: 'localhost' };
|
||||
let proxy = {
|
||||
'/root/': apiProxy,
|
||||
'/api': apiProxy,
|
||||
'/client': apiProxy,
|
||||
};
|
||||
|
||||
const basename = isDev ? undefined : `${pkgs.basename}`;
|
||||
console.log('Astro Config Basename:', basename);
|
||||
export default defineConfig({
|
||||
base: basename,
|
||||
integrations: [
|
||||
mdx(),
|
||||
react(), //
|
||||
// vue(),
|
||||
// sitemap(), // sitemap must be site has a domain
|
||||
],
|
||||
|
||||
vite: {
|
||||
plugins: [tailwindcss()],
|
||||
define: {
|
||||
BASE_NAME: JSON.stringify(basename || ''),
|
||||
},
|
||||
server: {
|
||||
port: 7008,
|
||||
host: '0.0.0.0',
|
||||
allowedHosts: true,
|
||||
proxy,
|
||||
},
|
||||
},
|
||||
});
|
||||
22
cli-center/components.json
Normal file
22
cli-center/components.json
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"$schema": "https://ui.shadcn.com/schema.json",
|
||||
"style": "new-york",
|
||||
"rsc": false,
|
||||
"tsx": true,
|
||||
"tailwind": {
|
||||
"config": "",
|
||||
"css": "src/styles/global.css",
|
||||
"baseColor": "neutral",
|
||||
"cssVariables": true,
|
||||
"prefix": ""
|
||||
},
|
||||
"iconLibrary": "lucide",
|
||||
"aliases": {
|
||||
"components": "@/components",
|
||||
"utils": "@/lib/utils",
|
||||
"ui": "@/components/ui",
|
||||
"lib": "@/lib",
|
||||
"hooks": "@/hooks"
|
||||
},
|
||||
"registries": {}
|
||||
}
|
||||
25
cli-center/kevisual.json
Normal file
25
cli-center/kevisual.json
Normal file
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"metadata": {
|
||||
"name": "kevisual",
|
||||
"share": "public"
|
||||
},
|
||||
"registry": "https://kevisual.cn/root/ai/kevisual/frontend/simple-astro-template",
|
||||
"clone": {
|
||||
".": {
|
||||
"enabled": true
|
||||
}
|
||||
},
|
||||
"syncd": [
|
||||
{
|
||||
"files": [
|
||||
"**/*"
|
||||
],
|
||||
"registry": ""
|
||||
}
|
||||
],
|
||||
"sync": {
|
||||
".gitignore": {
|
||||
"url": "/gitignore.txt"
|
||||
}
|
||||
}
|
||||
}
|
||||
71
cli-center/package.json
Normal file
71
cli-center/package.json
Normal file
@@ -0,0 +1,71 @@
|
||||
{
|
||||
"name": "@kevisual/cli",
|
||||
"version": "0.0.3",
|
||||
"description": "",
|
||||
"main": "index.js",
|
||||
"basename": "/root/cli",
|
||||
"scripts": {
|
||||
"dev": "astro dev",
|
||||
"build": "astro build",
|
||||
"preview": "astro preview",
|
||||
"pub": "envision deploy ./dist -k cli -v 0.0.4 -u -y y",
|
||||
"slide:dev": "slidev --open slides/index.md",
|
||||
"slide:build": "slidev build slides/index.md --base /root/cli-slide/",
|
||||
"slide:pub": "envision deploy ./slides/dist -k cli-slide -v 0.0.4 -u",
|
||||
"ui": "pnpm dlx shadcn@latest add "
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "abearxiong <xiongxiao@xiongxiao.me> (https://www.xiongxiao.me)",
|
||||
"license": "MIT",
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"@astrojs/mdx": "^4.3.13",
|
||||
"@astrojs/react": "^4.4.2",
|
||||
"@astrojs/sitemap": "^3.7.0",
|
||||
"@astrojs/vue": "^5.1.4",
|
||||
"@kevisual/api": "^0.0.17",
|
||||
"@kevisual/context": "^0.0.4",
|
||||
"@kevisual/kv-code": "^0.0.4",
|
||||
"@kevisual/query": "^0.0.35",
|
||||
"@kevisual/query-login": "^0.0.7",
|
||||
"@kevisual/registry": "^0.0.1",
|
||||
"@radix-ui/react-slot": "^1.2.4",
|
||||
"@tailwindcss/vite": "^4.1.18",
|
||||
"@uiw/react-md-editor": "^4.0.11",
|
||||
"antd": "^6.2.0",
|
||||
"astro": "^5.16.11",
|
||||
"class-variance-authority": "^0.7.1",
|
||||
"clsx": "^2.1.1",
|
||||
"dayjs": "^1.11.19",
|
||||
"es-toolkit": "^1.44.0",
|
||||
"github-markdown-css": "^5.8.1",
|
||||
"highlight.js": "^11.11.1",
|
||||
"lucide-react": "^0.562.0",
|
||||
"marked": "^17.0.1",
|
||||
"marked-highlight": "^2.2.3",
|
||||
"nanoid": "^5.1.6",
|
||||
"react": "^19.2.3",
|
||||
"react-dom": "^19.2.3",
|
||||
"react-toastify": "^11.0.5",
|
||||
"tailwind-merge": "^3.4.0",
|
||||
"vue": "^3.5.26",
|
||||
"zustand": "^5.0.10"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@kevisual/types": "^0.0.11",
|
||||
"@types/react": "^19.2.8",
|
||||
"@types/react-dom": "^19.2.3",
|
||||
"dotenv": "^17.2.3",
|
||||
"tailwindcss": "^4.1.18",
|
||||
"tw-animate-css": "^1.4.0"
|
||||
},
|
||||
"packageManager": "pnpm@10.28.0",
|
||||
"onlyBuiltDependencies": [
|
||||
"@tailwindcss/oxide",
|
||||
"esbuild",
|
||||
"sharp"
|
||||
]
|
||||
}
|
||||
6922
cli-center/pnpm-lock.yaml
generated
Normal file
6922
cli-center/pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
29
cli-center/slides/components/Counter.vue
Normal file
29
cli-center/slides/components/Counter.vue
Normal file
@@ -0,0 +1,29 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue'
|
||||
|
||||
const props = defineProps({
|
||||
count: {
|
||||
default: 0,
|
||||
},
|
||||
})
|
||||
|
||||
const counter = ref(props.count)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex w-min border border-main rounded-md">
|
||||
<button
|
||||
class="border-r border-main p-2 font-mono outline-none hover:bg-gray-400 hover:bg-opacity-20"
|
||||
@click="counter -= 1"
|
||||
>
|
||||
-
|
||||
</button>
|
||||
<span class="m-auto p-2">{{ counter }}</span>
|
||||
<button
|
||||
class="border-l border-main p-2 font-mono outline-none hover:bg-gray-400 hover:bg-opacity-20"
|
||||
@click="counter += 1"
|
||||
>
|
||||
+
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
611
cli-center/slides/demos/contents.md
Normal file
611
cli-center/slides/demos/contents.md
Normal file
@@ -0,0 +1,611 @@
|
||||
# Welcome to Slidev
|
||||
|
||||
Presentation slides for developers
|
||||
|
||||
<div @click="$slidev.nav.next" class="mt-12 py-1" hover:bg="white op-10">
|
||||
Press Space for next page <carbon:arrow-right />
|
||||
</div>
|
||||
|
||||
<div class="abs-br m-6 text-xl">
|
||||
<button @click="$slidev.nav.openInEditor()" title="Open in Editor" class="slidev-icon-btn">
|
||||
<carbon:edit />
|
||||
</button>
|
||||
<a href="https://github.com/slidevjs/slidev" target="_blank" class="slidev-icon-btn">
|
||||
<carbon:logo-github />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
The last comment block of each slide will be treated as slide notes. It will be visible and editable in Presenter Mode along with the slide. [Read more in the docs](https://sli.dev/guide/syntax.html#notes)
|
||||
-->
|
||||
|
||||
---
|
||||
transition: fade-out
|
||||
---
|
||||
|
||||
# What is Slidev?
|
||||
|
||||
Slidev is a slides maker and presenter designed for developers, consist of the following features
|
||||
|
||||
- 📝 **Text-based** - focus on the content with Markdown, and then style them later
|
||||
- 🎨 **Themable** - themes can be shared and re-used as npm packages
|
||||
- 🧑💻 **Developer Friendly** - code highlighting, live coding with autocompletion
|
||||
- 🤹 **Interactive** - embed Vue components to enhance your expressions
|
||||
- 🎥 **Recording** - built-in recording and camera view
|
||||
- 📤 **Portable** - export to PDF, PPTX, PNGs, or even a hostable SPA
|
||||
- 🛠 **Hackable** - virtually anything that's possible on a webpage is possible in Slidev
|
||||
<br>
|
||||
<br>
|
||||
|
||||
Read more about [Why Slidev?](https://sli.dev/guide/why)
|
||||
|
||||
<!--
|
||||
You can have `style` tag in markdown to override the style for the current page.
|
||||
Learn more: https://sli.dev/features/slide-scope-style
|
||||
-->
|
||||
|
||||
<style>
|
||||
h1 {
|
||||
background-color: #2B90B6;
|
||||
background-image: linear-gradient(45deg, #4EC5D4 10%, #146b8c 20%);
|
||||
background-size: 100%;
|
||||
-webkit-background-clip: text;
|
||||
-moz-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
-moz-text-fill-color: transparent;
|
||||
}
|
||||
</style>
|
||||
|
||||
<!--
|
||||
Here is another comment.
|
||||
-->
|
||||
|
||||
---
|
||||
transition: slide-up
|
||||
level: 2
|
||||
---
|
||||
|
||||
# Navigation
|
||||
|
||||
Hover on the bottom-left corner to see the navigation's controls panel, [learn more](https://sli.dev/guide/ui#navigation-bar)
|
||||
|
||||
## Keyboard Shortcuts
|
||||
|
||||
| | |
|
||||
| --------------------------------------------------- | --------------------------- |
|
||||
| <kbd>right</kbd> / <kbd>space</kbd> | next animation or slide |
|
||||
| <kbd>left</kbd> / <kbd>shift</kbd><kbd>space</kbd> | previous animation or slide |
|
||||
| <kbd>up</kbd> | previous slide |
|
||||
| <kbd>down</kbd> | next slide |
|
||||
|
||||
<!-- https://sli.dev/guide/animations.html#click-animation -->
|
||||
<img
|
||||
v-click
|
||||
class="absolute -bottom-9 -left-7 w-80 opacity-50"
|
||||
src="https://sli.dev/assets/arrow-bottom-left.svg"
|
||||
alt=""
|
||||
/>
|
||||
<p v-after class="absolute bottom-23 left-45 opacity-30 transform -rotate-10">Here!</p>
|
||||
|
||||
---
|
||||
layout: two-cols
|
||||
layoutClass: gap-16
|
||||
---
|
||||
|
||||
# Table of contents
|
||||
|
||||
You can use the `Toc` component to generate a table of contents for your slides:
|
||||
|
||||
```html
|
||||
<Toc minDepth="1" maxDepth="1" />
|
||||
```
|
||||
|
||||
The title will be inferred from your slide content, or you can override it with `title` and `level` in your frontmatter.
|
||||
|
||||
::right::
|
||||
|
||||
<Toc text-sm minDepth="1" maxDepth="2" />
|
||||
|
||||
---
|
||||
layout: image-right
|
||||
image: https://cover.sli.dev
|
||||
---
|
||||
|
||||
# Code
|
||||
|
||||
Use code snippets and get the highlighting directly, and even types hover!
|
||||
|
||||
```ts [filename-example.ts] {all|4|6|6-7|9|all} twoslash
|
||||
// TwoSlash enables TypeScript hover information
|
||||
// and errors in markdown code blocks
|
||||
// More at https://shiki.style/packages/twoslash
|
||||
import { computed, ref } from 'vue'
|
||||
|
||||
const count = ref(0)
|
||||
const doubled = computed(() => count.value * 2)
|
||||
|
||||
doubled.value = 2
|
||||
```
|
||||
|
||||
<arrow v-click="[4, 5]" x1="350" y1="310" x2="195" y2="342" color="#953" width="2" arrowSize="1" />
|
||||
|
||||
<!-- This allow you to embed external code blocks -->
|
||||
<!-- <<< @/snippets/external.ts#snippet -->
|
||||
|
||||
<!-- Footer -->
|
||||
|
||||
[Learn more](https://sli.dev/features/line-highlighting)
|
||||
|
||||
<!-- Inline style -->
|
||||
<style>
|
||||
.footnotes-sep {
|
||||
@apply mt-5 opacity-10;
|
||||
}
|
||||
.footnotes {
|
||||
@apply text-sm opacity-75;
|
||||
}
|
||||
.footnote-backref {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
|
||||
<!--
|
||||
Notes can also sync with clicks
|
||||
|
||||
[click] This will be highlighted after the first click
|
||||
|
||||
[click] Highlighted with `count = ref(0)`
|
||||
|
||||
[click:3] Last click (skip two clicks)
|
||||
-->
|
||||
|
||||
---
|
||||
level: 2
|
||||
---
|
||||
|
||||
# Shiki Magic Move
|
||||
|
||||
Powered by [shiki-magic-move](https://shiki-magic-move.netlify.app/), Slidev supports animations across multiple code snippets.
|
||||
|
||||
Add multiple code blocks and wrap them with <code>````md magic-move</code> (four backticks) to enable the magic move. For example:
|
||||
|
||||
````md magic-move {lines: true}
|
||||
```ts {*|2|*}
|
||||
// step 1
|
||||
const author = reactive({
|
||||
name: 'John Doe',
|
||||
books: [
|
||||
'Vue 2 - Advanced Guide',
|
||||
'Vue 3 - Basic Guide',
|
||||
'Vue 4 - The Mystery'
|
||||
]
|
||||
})
|
||||
```
|
||||
|
||||
```ts {*|1-2|3-4|3-4,8}
|
||||
// step 2
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
author: {
|
||||
name: 'John Doe',
|
||||
books: [
|
||||
'Vue 2 - Advanced Guide',
|
||||
'Vue 3 - Basic Guide',
|
||||
'Vue 4 - The Mystery'
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
```ts
|
||||
// step 3
|
||||
export default {
|
||||
data: () => ({
|
||||
author: {
|
||||
name: 'John Doe',
|
||||
books: [
|
||||
'Vue 2 - Advanced Guide',
|
||||
'Vue 3 - Basic Guide',
|
||||
'Vue 4 - The Mystery'
|
||||
]
|
||||
}
|
||||
})
|
||||
}
|
||||
```
|
||||
|
||||
Non-code blocks are ignored.
|
||||
|
||||
```vue
|
||||
<!-- step 4 -->
|
||||
<script setup>
|
||||
const author = {
|
||||
name: 'John Doe',
|
||||
books: [
|
||||
'Vue 2 - Advanced Guide',
|
||||
'Vue 3 - Basic Guide',
|
||||
'Vue 4 - The Mystery'
|
||||
]
|
||||
}
|
||||
</script>
|
||||
```
|
||||
````
|
||||
|
||||
---
|
||||
|
||||
# Components
|
||||
|
||||
<div grid="~ cols-2 gap-4">
|
||||
<div>
|
||||
|
||||
You can use Vue components directly inside your slides.
|
||||
|
||||
We have provided a few built-in components like `<Tweet/>` and `<Youtube/>` that you can use directly. And adding your custom components is also super easy.
|
||||
|
||||
```html
|
||||
<Counter :count="10" />
|
||||
```
|
||||
|
||||
<!-- ../components/Counter.vue -->
|
||||
<Counter :count="10" m="t-4" />
|
||||
|
||||
Check out [the guides](https://sli.dev/builtin/components.html) for more.
|
||||
|
||||
</div>
|
||||
<div>
|
||||
|
||||
```html
|
||||
<Tweet id="1390115482657726468" />
|
||||
```
|
||||
|
||||
<Tweet id="1390115482657726468" scale="0.65" />
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
Presenter note with **bold**, *italic*, and ~~striked~~ text.
|
||||
|
||||
Also, HTML elements are valid:
|
||||
<div class="flex w-full">
|
||||
<span style="flex-grow: 1;">Left content</span>
|
||||
<span>Right content</span>
|
||||
</div>
|
||||
-->
|
||||
|
||||
---
|
||||
class: px-20
|
||||
---
|
||||
|
||||
# Themes
|
||||
|
||||
Slidev comes with powerful theming support. Themes can provide styles, layouts, components, or even configurations for tools. Switching between themes by just **one edit** in your frontmatter:
|
||||
|
||||
<div grid="~ cols-2 gap-2" m="t-2">
|
||||
|
||||
```yaml
|
||||
---
|
||||
theme: default
|
||||
---
|
||||
```
|
||||
|
||||
```yaml
|
||||
---
|
||||
theme: seriph
|
||||
---
|
||||
```
|
||||
|
||||
<img border="rounded" src="https://github.com/slidevjs/themes/blob/main/screenshots/theme-default/01.png?raw=true" alt="">
|
||||
|
||||
<img border="rounded" src="https://github.com/slidevjs/themes/blob/main/screenshots/theme-seriph/01.png?raw=true" alt="">
|
||||
|
||||
</div>
|
||||
|
||||
Read more about [How to use a theme](https://sli.dev/guide/theme-addon#use-theme) and
|
||||
check out the [Awesome Themes Gallery](https://sli.dev/resources/theme-gallery).
|
||||
|
||||
---
|
||||
|
||||
# Clicks Animations
|
||||
|
||||
You can add `v-click` to elements to add a click animation.
|
||||
|
||||
<div v-click>
|
||||
|
||||
This shows up when you click the slide:
|
||||
|
||||
```html
|
||||
<div v-click>This shows up when you click the slide.</div>
|
||||
```
|
||||
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<v-click>
|
||||
|
||||
The <span v-mark.red="3"><code>v-mark</code> directive</span>
|
||||
also allows you to add
|
||||
<span v-mark.circle.orange="4">inline marks</span>
|
||||
, powered by [Rough Notation](https://roughnotation.com/):
|
||||
|
||||
```html
|
||||
<span v-mark.underline.orange>inline markers</span>
|
||||
```
|
||||
|
||||
</v-click>
|
||||
|
||||
<div mt-20 v-click>
|
||||
|
||||
[Learn more](https://sli.dev/guide/animations#click-animation)
|
||||
|
||||
</div>
|
||||
|
||||
---
|
||||
|
||||
# Motions
|
||||
|
||||
Motion animations are powered by [@vueuse/motion](https://motion.vueuse.org/), triggered by `v-motion` directive.
|
||||
|
||||
```html
|
||||
<div
|
||||
v-motion
|
||||
:initial="{ x: -80 }"
|
||||
:enter="{ x: 0 }"
|
||||
:click-3="{ x: 80 }"
|
||||
:leave="{ x: 1000 }"
|
||||
>
|
||||
Slidev
|
||||
</div>
|
||||
```
|
||||
|
||||
<div class="w-60 relative">
|
||||
<div class="relative w-40 h-40">
|
||||
<img
|
||||
v-motion
|
||||
:initial="{ x: 800, y: -100, scale: 1.5, rotate: -50 }"
|
||||
:enter="final"
|
||||
class="absolute inset-0"
|
||||
src="https://sli.dev/logo-square.png"
|
||||
alt=""
|
||||
/>
|
||||
<img
|
||||
v-motion
|
||||
:initial="{ y: 500, x: -100, scale: 2 }"
|
||||
:enter="final"
|
||||
class="absolute inset-0"
|
||||
src="https://sli.dev/logo-circle.png"
|
||||
alt=""
|
||||
/>
|
||||
<img
|
||||
v-motion
|
||||
:initial="{ x: 600, y: 400, scale: 2, rotate: 100 }"
|
||||
:enter="final"
|
||||
class="absolute inset-0"
|
||||
src="https://sli.dev/logo-triangle.png"
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="text-5xl absolute top-14 left-40 text-[#2B90B6] -z-1"
|
||||
v-motion
|
||||
:initial="{ x: -80, opacity: 0}"
|
||||
:enter="{ x: 0, opacity: 1, transition: { delay: 2000, duration: 1000 } }">
|
||||
Slidev
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- vue script setup scripts can be directly used in markdown, and will only affects current page -->
|
||||
<script setup lang="ts">
|
||||
const final = {
|
||||
x: 0,
|
||||
y: 0,
|
||||
rotate: 0,
|
||||
scale: 1,
|
||||
transition: {
|
||||
type: 'spring',
|
||||
damping: 10,
|
||||
stiffness: 20,
|
||||
mass: 2
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<div
|
||||
v-motion
|
||||
:initial="{ x:35, y: 30, opacity: 0}"
|
||||
:enter="{ y: 0, opacity: 1, transition: { delay: 3500 } }">
|
||||
|
||||
[Learn more](https://sli.dev/guide/animations.html#motion)
|
||||
|
||||
</div>
|
||||
|
||||
---
|
||||
|
||||
# LaTeX
|
||||
|
||||
LaTeX is supported out-of-box. Powered by [KaTeX](https://katex.org/).
|
||||
|
||||
<div h-3 />
|
||||
|
||||
Inline $\sqrt{3x-1}+(1+x)^2$
|
||||
|
||||
Block
|
||||
$$ {1|3|all}
|
||||
\begin{aligned}
|
||||
\nabla \cdot \vec{E} &= \frac{\rho}{\varepsilon_0} \\
|
||||
\nabla \cdot \vec{B} &= 0 \\
|
||||
\nabla \times \vec{E} &= -\frac{\partial\vec{B}}{\partial t} \\
|
||||
\nabla \times \vec{B} &= \mu_0\vec{J} + \mu_0\varepsilon_0\frac{\partial\vec{E}}{\partial t}
|
||||
\end{aligned}
|
||||
$$
|
||||
|
||||
[Learn more](https://sli.dev/features/latex)
|
||||
|
||||
---
|
||||
|
||||
# Diagrams
|
||||
|
||||
You can create diagrams / graphs from textual descriptions, directly in your Markdown.
|
||||
|
||||
<div class="grid grid-cols-4 gap-5 pt-4 -mb-6">
|
||||
|
||||
```mermaid {scale: 0.5, alt: 'A simple sequence diagram'}
|
||||
sequenceDiagram
|
||||
Alice->John: Hello John, how are you?
|
||||
Note over Alice,John: A typical interaction
|
||||
```
|
||||
|
||||
```mermaid {theme: 'neutral', scale: 0.8}
|
||||
graph TD
|
||||
B[Text] --> C{Decision}
|
||||
C -->|One| D[Result 1]
|
||||
C -->|Two| E[Result 2]
|
||||
```
|
||||
|
||||
```mermaid
|
||||
mindmap
|
||||
root((mindmap))
|
||||
Origins
|
||||
Long history
|
||||
::icon(fa fa-book)
|
||||
Popularisation
|
||||
British popular psychology author Tony Buzan
|
||||
Research
|
||||
On effectiveness<br/>and features
|
||||
On Automatic creation
|
||||
Uses
|
||||
Creative techniques
|
||||
Strategic planning
|
||||
Argument mapping
|
||||
Tools
|
||||
Pen and paper
|
||||
Mermaid
|
||||
```
|
||||
|
||||
```plantuml {scale: 0.7}
|
||||
@startuml
|
||||
|
||||
package "Some Group" {
|
||||
HTTP - [First Component]
|
||||
[Another Component]
|
||||
}
|
||||
|
||||
node "Other Groups" {
|
||||
FTP - [Second Component]
|
||||
[First Component] --> FTP
|
||||
}
|
||||
|
||||
cloud {
|
||||
[Example 1]
|
||||
}
|
||||
|
||||
database "MySql" {
|
||||
folder "This is my folder" {
|
||||
[Folder 3]
|
||||
}
|
||||
frame "Foo" {
|
||||
[Frame 4]
|
||||
}
|
||||
}
|
||||
|
||||
[Another Component] --> [Example 1]
|
||||
[Example 1] --> [Folder 3]
|
||||
[Folder 3] --> [Frame 4]
|
||||
|
||||
@enduml
|
||||
```
|
||||
|
||||
</div>
|
||||
|
||||
Learn more: [Mermaid Diagrams](https://sli.dev/features/mermaid) and [PlantUML Diagrams](https://sli.dev/features/plantuml)
|
||||
|
||||
---
|
||||
foo: bar
|
||||
dragPos:
|
||||
square: 691,32,167,_,-16
|
||||
---
|
||||
|
||||
# Draggable Elements
|
||||
|
||||
Double-click on the draggable elements to edit their positions.
|
||||
|
||||
<br>
|
||||
|
||||
###### Directive Usage
|
||||
|
||||
```md
|
||||
<img v-drag="'square'" src="https://sli.dev/logo.png">
|
||||
```
|
||||
|
||||
<br>
|
||||
|
||||
###### Component Usage
|
||||
|
||||
```md
|
||||
<v-drag text-3xl>
|
||||
<div class="i-carbon:arrow-up" />
|
||||
Use the `v-drag` component to have a draggable container!
|
||||
</v-drag>
|
||||
```
|
||||
|
||||
<v-drag pos="640,212,261,_,-15">
|
||||
<div text-center text-3xl border border-main rounded>
|
||||
Double-click me!
|
||||
</div>
|
||||
</v-drag>
|
||||
|
||||
<img v-drag="'square'" src="https://sli.dev/logo.png">
|
||||
|
||||
###### Draggable Arrow
|
||||
|
||||
```md
|
||||
<v-drag-arrow two-way />
|
||||
```
|
||||
|
||||
<v-drag-arrow pos="360,319,253,46" two-way op70 />
|
||||
|
||||
---
|
||||
src: ./pages/imported-slides.md
|
||||
hide: false
|
||||
---
|
||||
|
||||
---
|
||||
|
||||
# Monaco Editor
|
||||
|
||||
Slidev provides built-in Monaco Editor support.
|
||||
|
||||
Add `{monaco}` to the code block to turn it into an editor:
|
||||
|
||||
```ts {monaco}
|
||||
import { ref } from 'vue'
|
||||
import { emptyArray } from './external'
|
||||
|
||||
const arr = ref(emptyArray(10))
|
||||
```
|
||||
|
||||
Use `{monaco-run}` to create an editor that can execute the code directly in the slide:
|
||||
|
||||
```ts {monaco-run}
|
||||
import { version } from 'vue'
|
||||
import { emptyArray, sayHello } from './external'
|
||||
|
||||
sayHello()
|
||||
console.log(`vue ${version}`)
|
||||
console.log(emptyArray<number>(10).reduce(fib => [...fib, fib.at(-1)! + fib.at(-2)!], [1, 1]))
|
||||
```
|
||||
|
||||
---
|
||||
layout: center
|
||||
class: text-center
|
||||
---
|
||||
|
||||
# Learn More
|
||||
|
||||
[Documentation](https://sli.dev) · [GitHub](https://github.com/slidevjs/slidev) · [Showcases](https://sli.dev/resources/showcases)
|
||||
|
||||
<PoweredBySlidev mt-10 />
|
||||
28
cli-center/slides/index.md
Normal file
28
cli-center/slides/index.md
Normal file
@@ -0,0 +1,28 @@
|
||||
---
|
||||
theme: default
|
||||
# random image from a curated Unsplash collection by Anthony
|
||||
background: https://cover.sli.dev
|
||||
# 介绍文档: https://sli.dev
|
||||
title: Welcome to Slidev
|
||||
info: |
|
||||
## 关于Slidev的介绍
|
||||
演示稿
|
||||
class: text-center
|
||||
# https://sli.dev/features/drawing
|
||||
drawings:
|
||||
persist: false
|
||||
# slide transition: https://sli.dev/guide/animations.html#slide-transitions
|
||||
transition: slide-left
|
||||
# enable MDC Syntax: https://sli.dev/features/mdc
|
||||
mdc: true
|
||||
htmlAttrs:
|
||||
dir: ltr
|
||||
lang: zh-CN
|
||||
# duration of the presentation
|
||||
duration: 35min
|
||||
---
|
||||
# slide 是一个 所见即所得的幻灯片制作工具
|
||||
---
|
||||
src: ./demos/contents.md
|
||||
hide: false
|
||||
---
|
||||
10
cli-center/slides/pages/contents.md
Normal file
10
cli-center/slides/pages/contents.md
Normal file
@@ -0,0 +1,10 @@
|
||||
---
|
||||
title: '例子'
|
||||
---
|
||||
|
||||
# 常用语法结构
|
||||
|
||||
---
|
||||
---
|
||||
|
||||
# 第二个
|
||||
41
cli-center/src/apps/footer.tsx
Normal file
41
cli-center/src/apps/footer.tsx
Normal file
@@ -0,0 +1,41 @@
|
||||
import { wrapBasename } from "@/modules/basename"
|
||||
|
||||
export const Footer = () => {
|
||||
|
||||
const links = [
|
||||
{
|
||||
href: wrapBasename('/'),
|
||||
label: '主页',
|
||||
},
|
||||
{
|
||||
href: wrapBasename('/docs'),
|
||||
label: '文档',
|
||||
},
|
||||
]
|
||||
|
||||
return (
|
||||
<footer className="fixed bottom-0 w-full bg-white border-t border-gray-200 shadow-lg">
|
||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-4">
|
||||
{/* 链接区域 */}
|
||||
<nav className="flex flex-wrap justify-center items-center gap-2 sm:gap-4 mb-3">
|
||||
{links.map((link) => (
|
||||
<a
|
||||
key={link.href}
|
||||
href={link.href}
|
||||
className="relative px-4 py-2 text-sm sm:text-base font-medium text-gray-600 hover:text-blue-600 transition-all duration-300 ease-in-out
|
||||
before:absolute before:bottom-0 before:left-0 before:w-0 before:h-0.5 before:bg-blue-600 before:transition-all before:duration-300
|
||||
hover:before:w-full active:scale-95"
|
||||
>
|
||||
{link.label}
|
||||
</a>
|
||||
))}
|
||||
</nav>
|
||||
|
||||
{/* 版权信息 */}
|
||||
<div className="text-center text-xs sm:text-sm text-gray-500">
|
||||
© 2025 Daily Question
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
)
|
||||
}
|
||||
62
cli-center/src/apps/menu.tsx
Normal file
62
cli-center/src/apps/menu.tsx
Normal file
@@ -0,0 +1,62 @@
|
||||
import { useMemo } from "react";
|
||||
|
||||
export type MenuProps = {
|
||||
items: MenuItem[];
|
||||
basename?: string;
|
||||
};
|
||||
export type MenuItem = {
|
||||
id: string;
|
||||
data: {
|
||||
title: string;
|
||||
tags: string[];
|
||||
hideInMenu?: boolean;
|
||||
}
|
||||
}
|
||||
export const Menu = (props: MenuProps) => {
|
||||
const { items, basename = '' } = props;
|
||||
const list = useMemo(() => {
|
||||
return items.filter(item => !item.data?.hideInMenu).sort((a, b) => {
|
||||
return (a.id).localeCompare(b.id)
|
||||
});
|
||||
}, [items]);
|
||||
if (list.length === 0) {
|
||||
return null;
|
||||
}
|
||||
const currentPath = typeof window !== 'undefined' ? window.location.pathname : '';
|
||||
|
||||
const isActive = (itemId: string) => {
|
||||
return currentPath.includes(`/docs/${itemId}`);
|
||||
};
|
||||
|
||||
return (
|
||||
<nav className='flex-1 overflow-y-auto scrollbar bg-white border border-gray-200 rounded-lg shadow-sm'>
|
||||
<div className="sticky top-0 bg-white border-b border-gray-200 px-4 py-3 rounded-t-lg">
|
||||
<h2 className="text-sm font-semibold text-black">文档列表</h2>
|
||||
</div>
|
||||
<div className="p-2 space-y-0.5">
|
||||
{list.map(item => (
|
||||
<a
|
||||
key={item.id}
|
||||
href={`${basename}/docs/${item.id}/`}
|
||||
className={`group block rounded-md transition-all duration-200 ease-in-out border-l-3 ${
|
||||
isActive(item.id)
|
||||
? 'bg-gray-100 border-l-4 border-black shadow-sm'
|
||||
: 'border-transparent hover:bg-gray-50 hover:border-l-4 hover:border-gray-400'
|
||||
}`}
|
||||
>
|
||||
<div className="px-3 py-2.5">
|
||||
<h3 className={`text-sm font-medium transition-colors ${
|
||||
isActive(item.id)
|
||||
? 'text-black font-semibold'
|
||||
: 'text-gray-700 group-hover:text-black'
|
||||
}`}>
|
||||
{item.data?.title}
|
||||
</h3>
|
||||
</div>
|
||||
</a>
|
||||
))}
|
||||
</div>
|
||||
</nav>
|
||||
);
|
||||
}
|
||||
|
||||
103
cli-center/src/apps/settings/index.tsx
Normal file
103
cli-center/src/apps/settings/index.tsx
Normal file
@@ -0,0 +1,103 @@
|
||||
import { use, useEffect, useState } from "react";
|
||||
import { Layout } from "./layout"
|
||||
import { useStore } from "./store";
|
||||
import '@kevisual/kv-code/kv-code.js'
|
||||
const link = {
|
||||
loginDocs: '../docs/01-login-first/',
|
||||
settingsDocs: '../../docs/10-config/',
|
||||
}
|
||||
export const FirstLogin = () => {
|
||||
const store = useStore();
|
||||
const [username, setUsername] = useState('')
|
||||
const [password, setPassword] = useState('')
|
||||
useEffect(() => {
|
||||
store.initAdmin();
|
||||
}, []);
|
||||
useEffect(() => {
|
||||
if (store.username) {
|
||||
setUsername(store.username);
|
||||
}
|
||||
}, [store.username]);
|
||||
const onClickLogin = async () => {
|
||||
await store.login(username, password);
|
||||
}
|
||||
return (
|
||||
<Layout>
|
||||
<div className='flex items-center justify-center px-4'>
|
||||
<div className='w-full max-w-md space-y-6'>
|
||||
<h1 className='text-2xl font-bold text-black text-center'>管理员设置</h1>
|
||||
<blockquote className="text-gray-500 p-4 mt-4">
|
||||
第一次登录的<a className="text-gray-700 mx-1" href="https://kevisual.cn">kevisual</a> 用户为当前设备管理员。如果已经存在管理员账号,管理员可在"全局设置"中设置。
|
||||
<a className="text-gray-700 mx-1 underline" href={link.loginDocs}>文档</a>
|
||||
</blockquote>
|
||||
<form className='space-y-4 mt-8'>
|
||||
<div>
|
||||
<label htmlFor='account' className='block text-sm font-medium text-gray-900 mb-2'> 账号 </label>
|
||||
<input
|
||||
type='text'
|
||||
id='account'
|
||||
onChange={e => setUsername(e.target.value)}
|
||||
value={username}
|
||||
placeholder='请输入账号'
|
||||
autoComplete="username"
|
||||
className='w-full px-4 py-2 border-2 border-black bg-white text-black placeholder-gray-500 focus:outline-none focus:ring-2 focus:ring-black focus:border-transparent'
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<label htmlFor='password' className='block text-sm font-medium text-gray-900 mb-2'> 密码 </label>
|
||||
<input
|
||||
type='password'
|
||||
id='password'
|
||||
onChange={e => setPassword(e.target.value)}
|
||||
value={password}
|
||||
placeholder='请输入密码'
|
||||
autoComplete='current-password'
|
||||
className='w-full px-4 py-2 border-2 border-black bg-white text-black placeholder-gray-500 focus:outline-none focus:ring-2 focus:ring-black focus:border-transparent'
|
||||
/>
|
||||
</div>
|
||||
<button
|
||||
type='button'
|
||||
onClick={onClickLogin}
|
||||
className='w-full px-4 py-2 bg-black text-white font-medium hover:bg-gray-800 active:bg-gray-900 transition-colors focus:outline-none focus:ring-2 focus:ring-black focus:ring-offset-2'>
|
||||
确定
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</Layout>
|
||||
);
|
||||
}
|
||||
|
||||
export const Config = () => {
|
||||
const store = useStore();
|
||||
const [code, setCode] = useState('');
|
||||
useEffect(() => {
|
||||
store.initAdmin();
|
||||
}, []);
|
||||
const onSaveConfig = async () => {
|
||||
console.log('onSaveConfig', code);
|
||||
const parsedCode = JSON.parse(code);
|
||||
await store.saveConfig(parsedCode);
|
||||
}
|
||||
return (
|
||||
<Layout>
|
||||
<div className="p-4 flex flex-col h-full">
|
||||
<div className="mb-4 flex justify-between items-center">
|
||||
<h2 className="text-xl font-bold text-black" >
|
||||
<a href={link.settingsDocs} target="_blank" rel="noreferrer" className="underline">
|
||||
配置中心文档
|
||||
</a>
|
||||
</h2>
|
||||
<button
|
||||
onClick={onSaveConfig}
|
||||
className="px-6 py-2 bg-black text-white font-medium hover:bg-gray-800 active:bg-gray-900 transition-colors focus:outline-none focus:ring-2 focus:ring-black focus:ring-offset-2">
|
||||
保存配置
|
||||
</button>
|
||||
</div>
|
||||
<kv-code-editor className="flex-1" value={JSON.stringify(store.config, null, 2)} onChange={(e) => {
|
||||
setCode(e.nativeEvent?.detail?.value);
|
||||
}} type="json"></kv-code-editor>
|
||||
</div>
|
||||
</Layout>
|
||||
)
|
||||
}
|
||||
24
cli-center/src/apps/settings/layout.tsx
Normal file
24
cli-center/src/apps/settings/layout.tsx
Normal file
@@ -0,0 +1,24 @@
|
||||
import { Nav } from './nav'
|
||||
import { toast, ToastContainer } from 'react-toastify'
|
||||
|
||||
export const Layout = (props) => {
|
||||
return (
|
||||
<div className="flex min-h-screen bg-white">
|
||||
<div className="left-nav w-64 bg-white border-r border-gray-100">
|
||||
<div className="p-4">
|
||||
<h2 className="text-xl font-bold text-black">设置</h2>
|
||||
</div>
|
||||
<div className="p-4">
|
||||
<Nav />
|
||||
</div>
|
||||
</div>
|
||||
<div className="main flex-1 flex flex-col">
|
||||
<div className="main-header bg-white px-6 py-4 border-b border-gray-100">
|
||||
<h1 className="text-lg font-semibold text-black">配置中心</h1>
|
||||
</div>
|
||||
<main className="flex-1 p-6 bg-gray-50">{props.children}</main>
|
||||
</div>
|
||||
<ToastContainer />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
34
cli-center/src/apps/settings/nav.tsx
Normal file
34
cli-center/src/apps/settings/nav.tsx
Normal file
@@ -0,0 +1,34 @@
|
||||
import { wrapBasename } from "../../modules/basename";
|
||||
import { clsx } from 'clsx';
|
||||
|
||||
export const Nav = () => {
|
||||
const currentPath = typeof window !== 'undefined' ? window.location.pathname : ''
|
||||
|
||||
const navItems = [
|
||||
{ name: '管理员设置', path: wrapBasename('/settings/') },
|
||||
{ name: '全局设置', path: wrapBasename('/settings/all/') },
|
||||
];
|
||||
|
||||
const isActive = (path: string) => {
|
||||
return currentPath === path
|
||||
}
|
||||
|
||||
return (
|
||||
<nav className="space-y-2">
|
||||
{navItems.map((item) => (
|
||||
<a
|
||||
key={item.path}
|
||||
href={item.path}
|
||||
className={clsx(
|
||||
"block px-4 py-2 rounded transition-colors border-l-4",
|
||||
isActive(item.path)
|
||||
? "bg-gray-100 text-black border-black font-medium"
|
||||
: "text-gray-700 border-transparent hover:bg-gray-50 hover:border-gray-300"
|
||||
)}
|
||||
>
|
||||
{item.name}
|
||||
</a>
|
||||
))}
|
||||
</nav>
|
||||
)
|
||||
}
|
||||
55
cli-center/src/apps/settings/store.ts
Normal file
55
cli-center/src/apps/settings/store.ts
Normal file
@@ -0,0 +1,55 @@
|
||||
import { clientQuery, queryLogin } from '@/modules/query';
|
||||
import { create } from 'zustand';
|
||||
import { toast } from 'react-toastify';
|
||||
type SettingState = {
|
||||
username?: string;
|
||||
initAdmin: () => any;
|
||||
login: (username: string, password: string) => any;
|
||||
config?: any;
|
||||
saveConfig: any;
|
||||
}
|
||||
export const useStore = create<SettingState>((set => ({
|
||||
username: undefined,
|
||||
config: undefined,
|
||||
initAdmin: async () => {
|
||||
const res = await clientQuery.post({
|
||||
path: 'config'
|
||||
})
|
||||
console.log('initAdmin', res);
|
||||
if (res.code === 200) {
|
||||
const auth = res.data.auth || {}
|
||||
if (auth.username) {
|
||||
set({ username: auth.username });
|
||||
}
|
||||
set({ config: res.data });
|
||||
}
|
||||
},
|
||||
login: async (username: string, password: string) => {
|
||||
const res = await clientQuery.post({
|
||||
path: 'admin',
|
||||
key: 'login',
|
||||
username,
|
||||
password
|
||||
});
|
||||
if (res.code === 200) {
|
||||
set({ username });
|
||||
const setToken = await queryLogin.setLoginToken(res.data)
|
||||
toast.success('登录成功');
|
||||
}
|
||||
|
||||
return res;
|
||||
},
|
||||
saveConfig: async (config: any) => {
|
||||
const res = await clientQuery.post({
|
||||
path: 'config',
|
||||
key: 'set',
|
||||
data: config
|
||||
})
|
||||
if (res.code === 200) {
|
||||
set({ config })
|
||||
toast.success('配置保存成功');
|
||||
}
|
||||
console.log('saveConfig res', res);
|
||||
return res;
|
||||
}
|
||||
})));
|
||||
70
cli-center/src/components/MdPreview.tsx
Normal file
70
cli-center/src/components/MdPreview.tsx
Normal file
@@ -0,0 +1,70 @@
|
||||
import { cn } from '@/lib/utils';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Marked } from 'marked';
|
||||
import hljs from 'highlight.js';
|
||||
import { markedHighlight } from 'marked-highlight';
|
||||
|
||||
const markedAndHighlight = new Marked(
|
||||
markedHighlight({
|
||||
emptyLangClass: 'hljs',
|
||||
langPrefix: 'hljs language-',
|
||||
highlight(code, lang, info) {
|
||||
const language = hljs.getLanguage(lang) ? lang : 'plaintext';
|
||||
return hljs.highlight(code, { language }).value;
|
||||
},
|
||||
}),
|
||||
);
|
||||
|
||||
export const md2html = async (md: string) => {
|
||||
const html = markedAndHighlight.parse(md);
|
||||
return html;
|
||||
};
|
||||
|
||||
export const clearMeta = (markdown?: string) => {
|
||||
if (!markdown) return '';
|
||||
// Remove YAML front matter if present
|
||||
const yamlRegex = /^---\n[\s\S]*?\n---\n/;
|
||||
return markdown.replace(yamlRegex, '');
|
||||
};
|
||||
type Props = {
|
||||
children?: React.ReactNode;
|
||||
className?: string;
|
||||
style?: React.CSSProperties;
|
||||
content?: string; // Optional content prop for markdown text
|
||||
[key: string]: any; // Allow any additional props
|
||||
};
|
||||
export const MarkdownPreview = (props: Props) => {
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
'markdown-body scrollbar h-full overflow-auto w-full px-6 py-2 max-w-[800px] border my-4 flex flex-col justify-self-center rounded-md shadow-md',
|
||||
props.className,
|
||||
)}
|
||||
style={props.style}>
|
||||
{props.children ? <WrapperText>{props.children}</WrapperText> : <MarkdownPreviewWrapper content={clearMeta(props.content)} />}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export const WrapperText = (props: { children?: React.ReactNode; html?: string }) => {
|
||||
if (props.html) {
|
||||
return <div className='w-full' dangerouslySetInnerHTML={{ __html: props.html }} />;
|
||||
}
|
||||
return <div className='w-full h-full'>{props.children}</div>;
|
||||
};
|
||||
|
||||
export const MarkdownPreviewWrapper = (props: Props) => {
|
||||
const [html, setHtml] = useState<string>('');
|
||||
useEffect(() => {
|
||||
init();
|
||||
}, [props.content]);
|
||||
const init = async () => {
|
||||
if (props.content) {
|
||||
const htmlContent = await md2html(props.content);
|
||||
setHtml(htmlContent);
|
||||
} else {
|
||||
setHtml('');
|
||||
}
|
||||
};
|
||||
return <WrapperText html={html} />;
|
||||
};
|
||||
47
cli-center/src/components/html.astro
Normal file
47
cli-center/src/components/html.astro
Normal file
@@ -0,0 +1,47 @@
|
||||
---
|
||||
import '../styles/global.css';
|
||||
import '../styles/theme.css';
|
||||
export interface Props {
|
||||
title?: string;
|
||||
description?: string;
|
||||
lang?: string;
|
||||
charset?: string;
|
||||
}
|
||||
|
||||
const { title = 'Light Code', description = 'A lightweight code editor', lang = 'zh-CN', charset = 'UTF-8' } = Astro.props;
|
||||
---
|
||||
|
||||
<!doctype html>
|
||||
<html lang={lang}>
|
||||
<head>
|
||||
<meta charset={charset} />
|
||||
<meta name='viewport' content='width=device-width, initial-scale=1.0' />
|
||||
<meta name='description' content={description} />
|
||||
<title>{title}</title>
|
||||
<!-- 样式 -->
|
||||
<slot name='head' />
|
||||
</head>
|
||||
<body>
|
||||
<slot />
|
||||
|
||||
<!-- 脚本 -->
|
||||
<slot name='scripts' />
|
||||
</body>
|
||||
</html>
|
||||
|
||||
<style>
|
||||
html {
|
||||
font-family: system-ui, sans-serif;
|
||||
}
|
||||
|
||||
html,
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
</style>
|
||||
60
cli-center/src/components/ui/button.tsx
Normal file
60
cli-center/src/components/ui/button.tsx
Normal file
@@ -0,0 +1,60 @@
|
||||
import * as React from "react"
|
||||
import { Slot } from "@radix-ui/react-slot"
|
||||
import { cva, type VariantProps } from "class-variance-authority"
|
||||
|
||||
import { cn } from "@/lib/utils"
|
||||
|
||||
const buttonVariants = cva(
|
||||
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
|
||||
{
|
||||
variants: {
|
||||
variant: {
|
||||
default: "bg-primary text-primary-foreground hover:bg-primary/90",
|
||||
destructive:
|
||||
"bg-destructive text-white hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
|
||||
outline:
|
||||
"border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50",
|
||||
secondary:
|
||||
"bg-secondary text-secondary-foreground hover:bg-secondary/80",
|
||||
ghost:
|
||||
"hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
|
||||
link: "text-primary underline-offset-4 hover:underline",
|
||||
},
|
||||
size: {
|
||||
default: "h-9 px-4 py-2 has-[>svg]:px-3",
|
||||
sm: "h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5",
|
||||
lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
|
||||
icon: "size-9",
|
||||
"icon-sm": "size-8",
|
||||
"icon-lg": "size-10",
|
||||
},
|
||||
},
|
||||
defaultVariants: {
|
||||
variant: "default",
|
||||
size: "default",
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
function Button({
|
||||
className,
|
||||
variant,
|
||||
size,
|
||||
asChild = false,
|
||||
...props
|
||||
}: React.ComponentProps<"button"> &
|
||||
VariantProps<typeof buttonVariants> & {
|
||||
asChild?: boolean
|
||||
}) {
|
||||
const Comp = asChild ? Slot : "button"
|
||||
|
||||
return (
|
||||
<Comp
|
||||
data-slot="button"
|
||||
className={cn(buttonVariants({ variant, size, className }))}
|
||||
{...props}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export { Button, buttonVariants }
|
||||
29
cli-center/src/components/vue/Counter.vue
Normal file
29
cli-center/src/components/vue/Counter.vue
Normal file
@@ -0,0 +1,29 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue'
|
||||
|
||||
const props = defineProps({
|
||||
count: {
|
||||
default: 0,
|
||||
},
|
||||
})
|
||||
|
||||
const counter = ref(props.count)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex w-min border border-main rounded-md">
|
||||
<button
|
||||
class="border-r border-main p-2 font-mono outline-none hover:bg-gray-400 hover:bg-opacity-20"
|
||||
@click="counter -= 1"
|
||||
>
|
||||
-
|
||||
</button>
|
||||
<span class="m-auto p-2">{{ counter }}</span>
|
||||
<button
|
||||
class="border-l border-main p-2 font-mono outline-none hover:bg-gray-400 hover:bg-opacity-20"
|
||||
@click="counter += 1"
|
||||
>
|
||||
+
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user