diff --git a/assistant/package.json b/assistant/package.json index 29b540a..d5a8152 100644 --- a/assistant/package.json +++ b/assistant/package.json @@ -48,7 +48,7 @@ "@kevisual/logger": "^0.0.4", "@kevisual/query": "0.0.33", "@kevisual/query-login": "0.0.7", - "@kevisual/router": "^0.0.47", + "@kevisual/router": "^0.0.48", "@kevisual/types": "^0.0.10", "@kevisual/use-config": "^1.0.21", "@types/bun": "^1.3.5", diff --git a/assistant/src/app.ts b/assistant/src/app.ts index 4f47588..9f70fd5 100644 --- a/assistant/src/app.ts +++ b/assistant/src/app.ts @@ -1,4 +1,5 @@ import { App } from '@kevisual/router'; +// import { App } from '@kevisual/router/src/app.ts'; import { HttpsPem } from '@/module/assistant/https/sign.ts'; // import { AssistantConfig } from '@/module/assistant/index.ts'; import { AssistantInit, parseHomeArg } from '@/services/init/index.ts'; diff --git a/assistant/src/module/assistant/proxy/http-proxy.ts b/assistant/src/module/assistant/proxy/http-proxy.ts index 4c367b8..1669175 100644 --- a/assistant/src/module/assistant/proxy/http-proxy.ts +++ b/assistant/src/module/assistant/proxy/http-proxy.ts @@ -8,6 +8,10 @@ export const defaultApiProxy = [ path: '/api/router', target: 'https://kevisual.cn', }, + { + path: '/api/s1', + target: 'https://kevisual.cn', + }, { path: '/v1', target: 'https://kevisual.cn', @@ -111,5 +115,5 @@ export const httpProxy = (req: http.IncomingMessage, res: http.ServerResponse, p }); // 处理 POST 请求的请求体（传递数据到目标服务器）,end:true 表示当请求体结束时，关闭请求 // req.pipe(proxyReq, { end: true }); - pipeProxyReq(req, proxyReq); + pipeProxyReq(req, proxyReq, res); } \ No newline at end of file diff --git a/assistant/src/module/assistant/proxy/pipe.ts b/assistant/src/module/assistant/proxy/pipe.ts index b91bab5..89d7011 100644 --- a/assistant/src/module/assistant/proxy/pipe.ts +++ b/assistant/src/module/assistant/proxy/pipe.ts @@ -46,12 +46,13 @@ export const pipeIncoming = (proxyRes: http.IncomingMessage, res: http.ServerRes 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(); @@ -77,43 +78,39 @@ export const pipeIncoming = (proxyRes: http.IncomingMessage, res: http.ServerRes * @param req 客户端的请求对象 * @param proxyReq 代理服务器的请求对象 */ -export const pipeProxyReq = (req: http.IncomingMessage, proxyReq: http.ClientRequest) => { +export const pipeProxyReq = async (req: http.IncomingMessage, proxyReq: http.ClientRequest, res: any) => { if (isBun) { - // 检查 req 对象是否具有必要的事件监听方法，如果没有，说明可能已经被处理过 - if (typeof req.on !== 'function') { - // 如果 req.on 不存在，直接结束代理请求 + try { + const method = req.method?.toUpperCase(); + console.log('Bun pipeProxyReq method', method, req.body); + // @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; + } + console.log('Bun pipeProxyReq content-type', contentType); + // @ts-ignore + const bodyString = req.body; + bodyString && proxyReq.write(bodyString); proxyReq.end(); - return; - } - - // Bun环境下需要手动收集请求数据并发送 - const chunks: Buffer[] = []; - - // 监听请求数据到达事件，收集所有数据块 - req.on('data', (chunk: Buffer) => { - chunks.push(chunk); - }); - - // 监听请求数据结束事件，将收集的数据合并后发送给目标服务器 - req.on('end', () => { - const result = Buffer.concat(chunks); - proxyReq.end(result); - }); - - // 监听请求错误事件，处理请求传输过程中的错误 - req.on('error', (error) => { - // ClientRequest没有writeHead方法，直接销毁请求以触发错误处理 + } catch (error) { proxyReq.destroy(error); - }); - - } else { - // 非 Bun 环境下使用标准的pipe方法进行流传输 - // 同样检查 pipe 方法是否存在以确保兼容性 - if (typeof req.pipe === 'function') { - req.pipe(proxyReq, { end: true }); - } else { - // 如果 pipe 方法不存在，直接结束代理请求 - proxyReq.end(); } + } else { + // Node.js标准环境下直接使用pipe进行流传输 + req.pipe(proxyReq, { end: true }); } } \ No newline at end of file diff --git a/assistant/src/server.ts b/assistant/src/server.ts index 3248da8..c197320 100644 --- a/assistant/src/server.ts +++ b/assistant/src/server.ts @@ -39,8 +39,8 @@ export const runServer = async (port: number = 51015, listenPath = '127.0.0.1') }); } app.server.on([{ - id: 'all', - func: proxyRoute as any + id: 'handle-all', + func: proxyRoute as any, }, ...proxyWs() ]); diff --git a/cli-center/package.json b/cli-center/package.json index 3dd5d50..73c3507 100644 --- a/cli-center/package.json +++ b/cli-center/package.json @@ -8,7 +8,7 @@ "dev": "astro dev", "build": "astro build", "preview": "astro preview", - "pub": "envision deploy ./dist -k cli -v 0.0.3 -u", + "pub": "envision deploy ./dist -k cli -v 0.0.3 -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.3 -u", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c49e0d..952f022 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -146,8 +146,8 @@ importers: specifier: 0.0.7 version: 0.0.7(@kevisual/query@0.0.33) '@kevisual/router': - specifier: ^0.0.47 - version: 0.0.47(supports-color@10.2.2) + specifier: ^0.0.48 + version: 0.0.48(supports-color@10.2.2) '@kevisual/types': specifier: ^0.0.10 version: 0.0.10 @@ -1310,8 +1310,8 @@ packages: '@kevisual/router@0.0.39': resolution: {integrity: sha512-jE7/csRkMUuuSWl5RZHbOY44xL/2RI/vAJzCsqt150taW5CAri3efdaQJOQlzghlOqqA+1ZyGajxUAYv/HaQxA==} - '@kevisual/router@0.0.47': - resolution: {integrity: sha512-j6/IHQ7hjyJxoSjNbygfrBXi1w7tmGvcNqcLRJwpmSaks65uN6NC9H7Wxna2+/TRtLnRUghHUMIL1pm1uhHeOg==} + '@kevisual/router@0.0.48': + resolution: {integrity: sha512-WsSvT+NpfC/bZbaAzE3WSKD2DRZP0JuPQJGr4YucSdO/lOLB4cEpOZRbPlV3l7G064ow8QJRAN2DUW+bRjrp1A==} '@kevisual/types@0.0.10': resolution: {integrity: sha512-Q73uzzjk9UidumnmCvOpgzqDDvQxsblz22bIFuoiioUFJWwaparx8bpd8ArRyFojicYL1YJoFDzDZ9j9NN8grA==} @@ -6459,7 +6459,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@kevisual/router@0.0.47(supports-color@10.2.2)': + '@kevisual/router@0.0.48(supports-color@10.2.2)': dependencies: path-to-regexp: 8.3.0 selfsigned: 5.2.0 diff --git a/src/ai/ai.ts b/src/ai/ai.ts index ac5371a..118b349 100644 --- a/src/ai/ai.ts +++ b/src/ai/ai.ts @@ -1,4 +1,4 @@ -import { App } from '@kevisual/app'; +import { App } from '@kevisual/app/mod.ts'; import { storage } from '../module/query.ts'; import { sessionStorage } from '../module/cache.ts'; export const app = new App({ token: storage.getItem('token') || '', storage: sessionStorage }); \ No newline at end of file