feat(common): 添加差异渲染函数

- 新增 render_diff 函数，用于将 Git 差异文本渲染为 HTML 格式的可视化对比视图
- 引入并使用 Diff2Html 库进行差异渲染
- 支持自定义渲染配置，如输出格式、颜色方案等

Author: wuliya336

package.json

@@ -84,6 +84,7 @@
     "axios": "npm:@candriajs/axios@1.0.14",
     "color-convert": "^3.1.0",
     "dayjs": "^1.11.13",
+    "diff2html": "^3.4.51",
     "exec": "npm:@candriajs/exec@^1.0.2",
     "git-url-parse": "^16.0.1",
     "http-proxy-agent": "^7.0.2",

src/common/diff.ts

@@ -0,0 +1,37 @@
+import * as Diff2Html from 'diff2html'
+import { ColorSchemeType } from 'diff2html/lib/types'
+
+import { MissingDiffMsg } from './errorMsg'
+
+/**
+ * 渲染差异文本为HTML格式的可视化对比视图
+ *
+ * @param diff - 需要渲染的Git差异文本(diff格式字符串)
+ * @param options - (可选) Diff2Html配置选项，用于自定义渲染行为
+ * @returns 渲染后的HTML字符串
+ *
+ * @example
+ * // 基本用法
+ * const html = render_diff(diffText);
+ *
+ * @example
+ * // 自定义配置
+ * const html = render_diff(diffText, {
+ *   outputFormat: 'line-by-line',
+ *   colorScheme: ColorSchemeType.DARK
+ * });
+ */
+export function render_diff (diff: string, options?: Diff2Html.Diff2HtmlConfig): string {
+  if (!diff) throw new Error(MissingDiffMsg)
+  const config: Diff2Html.Diff2HtmlConfig = {
+    drawFileList: false,
+    diffMaxChanges: 100,
+    diffMaxLineLength: 300,
+    matching: 'lines',
+    colorScheme: ColorSchemeType.LIGHT,
+    outputFormat: 'side-by-side',
+    ...options
+  }
+  const outputHtml = Diff2Html.html(diff, config)
+  return outputHtml
+}

src/common/errorMsg.ts

@@ -123,3 +123,5 @@ export const MIssingSearchQueryMsg = '喵呜~ 搜索查询不能为空哦'
 
 /** 其他 */
 export const RateLimitExceededMsg = '喵呜~ 访问速率受限啦 请等待1小时后再试 或 使用访问令牌提升限额'
+export const NetworkErrorMsg = '喵呜~ 网络错误，请检查网络连接或代理设置'
+export const MissingDiffMsg = '喵呜~ Diff 内容不能为空'

src/common/index.ts

@@ -1,3 +1,4 @@
+export * from '@/common/diff'
 export * from '@/common/errorMsg'
 export * from '@/common/git'
 export * from '@/common/markdown'

src/index.ts

@@ -8,6 +8,7 @@ import {
   get_local_repo_default_branch,
   get_relative_time,
   get_remote_repo_default_branch,
+  render_diff,
   render_markdown
 } from '@/common'
 import { create_state_id } from '@/models'
@@ -46,6 +47,7 @@ export {
   get_local_repo_default_branch,
   get_relative_time,
   get_remote_repo_default_branch,
+  render_diff,
   render_markdown
 }
 export default Client

src/models/base/request.ts

@@ -54,10 +54,11 @@ export class Request {
     data?: any,
     customHeaders?: Record<string, string>
   ): Promise<ResponseType> {
-    const url = `${this.baseUrl}/${path}`.replace(/\/+/g, '/')
+    const url = `${this.baseUrl.replace(/\/+$/, '')}/${path.replace(/^\/+|\/+$/g, '')}`
     const config: AxiosRequestConfig = {
       headers: this.createHeaders(customHeaders),
       params,
+      maxRedirects: 2,
       validateStatus: () => true
     }
 

src/models/platform/github/client.ts

@@ -12,6 +12,7 @@ import {
   MissingClientSecretMsg,
   MissingPrivateKeyMsg,
   MissingRequestPathMsg,
+  NetworkErrorMsg,
   ProxyTypeNotSupportedMsg,
   RateLimitExceededMsg,
   UnauthorizedMsg
@@ -416,17 +417,6 @@ export class GitHubClient {
     return jwt.sign(payload, this.Private_Key!, { algorithm: 'RS256' })
   }
 
-  /**
-   * 获取当前请求的配置
-   * @returns 当前请求的配置对象
-   */
-  private getCurrentRequestConfig (): RequestConfigType {
-    return {
-      ...this.currentRequestConfig,
-      url: this.api_url
-    }
-  }
-
   /**
    * 设置当前请求的配置
    * @protected - 仅在父类与子类中方法中可访问
@@ -446,7 +436,7 @@ export class GitHubClient {
    * @returns 返回一个新的 Request 实例
    */
   private createRequest (): Request {
-    const { url, token, tokenType } = this.getCurrentRequestConfig()
+    const { url, token, tokenType } = this.currentRequestConfig
     const proxyConfig = this.proxy?.type !== 'common' ? this.proxy : null
     const customHeaders = {
       'X-GitHub-Api-Version': '2022-11-28',
@@ -474,6 +464,7 @@ export class GitHubClient {
       })
       const request = this.createRequest()
       const req = await request.get(path, parms, customHeaders)
+      if (req.statusCode === 500 && req.msg === 'Network Error') throw new Error(NetworkErrorMsg)
       if (req.statusCode === 401) throw new Error(UnauthorizedMsg)
       if ((req.statusCode === 403 || req.statusCode === 429) && req.headers['x-ratelimit-remaining'] === '0') {
         throw new Error(RateLimitExceededMsg)
@@ -509,6 +500,7 @@ export class GitHubClient {
       })
       const request = this.createRequest()
       const req = await request.post(path, data, customHeaders)
+      if (req.statusCode === 500 && req.msg === 'Network Error') throw new Error(NetworkErrorMsg)
       if (req.statusCode === 401) throw new Error(UnauthorizedMsg)
       if ((req.statusCode === 403 || req.statusCode === 429) && req.headers['x-ratelimit-remaining'] === '0') {
         throw new Error(RateLimitExceededMsg)
@@ -546,6 +538,7 @@ export class GitHubClient {
       })
       const request = this.createRequest()
       const req = await request.patch(path, params, data, customHeaders)
+      if (req.statusCode === 500 && req.msg === 'Network Error') throw new Error(NetworkErrorMsg)
       if (req.statusCode === 401) throw new Error(UnauthorizedMsg)
       if ((req.statusCode === 403 || req.statusCode === 429) && req.headers['x-ratelimit-remaining'] === '0') {
         throw new Error(RateLimitExceededMsg)
@@ -581,6 +574,7 @@ export class GitHubClient {
       })
       const request = this.createRequest()
       const req = await request.put(path, data, customHeaders)
+      if (req.statusCode === 500 && req.msg === 'Network Error') throw new Error(NetworkErrorMsg)
       if (req.statusCode === 401) throw new Error(UnauthorizedMsg)
       if ((req.statusCode === 403 || req.statusCode === 429) && req.headers['x-ratelimit-remaining'] === '0') {
         throw new Error(RateLimitExceededMsg)
@@ -618,6 +612,7 @@ export class GitHubClient {
       })
       const request = this.createRequest()
       const req = await request.delete(path, params, data, customHeaders)
+      if (req.statusCode === 500 && req.msg === 'Network Error') throw new Error(NetworkErrorMsg)
       if (req.statusCode === 401) throw new Error(UnauthorizedMsg)
       if ((req.statusCode === 403 || req.statusCode === 429) && req.headers['x-ratelimit-remaining'] === '0') {
         throw new Error(RateLimitExceededMsg)

src/models/platform/github/pull_request.ts

@@ -34,6 +34,8 @@ import type {
   GetPullRequestCommentInfoResponseType,
   GetPullRequestCommentsListParamType,
   GetPullRequestCommentsListResponseType,
+  GetPullRequestDiffParamType,
+  GetPullRequestDiffResponseType,
   GetPullRequestFilesListParamType,
   GetPullRequestFilesListResponseType,
   IssueLabelType,
@@ -873,6 +875,25 @@ export class Pull_Request extends GitHubClient {
     }
   }
 
+  public async get_pull_request_diff (
+    options: GetPullRequestDiffParamType
+  ): Promise<ApiResponseType<GetPullRequestDiffResponseType>> {
+    if (!(options.owner || options.repo)) throw new Error(MissingRepoOwnerOrNameMsg)
+    if (!options.pr_number) throw new Error(MissingPullRequestNumberMsg)
+    try {
+      this.setRequestConfig({
+        url: this.base_url
+      })
+      const { owner, repo, pr_number } = options
+      const res = await this.get(`/${owner}/${repo}/pull/${pr_number}.diff`, null, {
+        Accept: 'text/plain'
+      })
+      return res
+    } catch (error) {
+      throw new Error(`[GitHub] 获取拉取请求diff失败: ${(error as Error).message}`)
+    }
+  }
+
   /**
    * 获取拉取请求文件列表
    * 权限:

src/types/platform/pull_request.ts

@@ -263,6 +263,11 @@ export interface GetPullRequestFilesListParamType extends RepoBaseParamType, Pul
 /** 获取拉取请求文件列表响应类型 */
 export type GetPullRequestFilesListResponseType = Array<PullRequestFilesListType>
 
+/** 获取拉取请求差异内容参数类型 */
+export type GetPullRequestDiffParamType = RepoBaseParamType & PullRequestNumberParamType
+/** 获取拉取请求差异内容响应类型 */
+export type GetPullRequestDiffResponseType = string
+
 /** 获取拉取请求评论信息参数类型 */
 export type GetPullRequestCommentInfoParamType = RepoBaseParamType & CommentIdParamType