fix: defaultHttpUrl

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.4.6",
+  "version": "4.4.9",
   "icon": "./logo.png",
   "authors": [
     {

napcat.webui/src/components/onebot/api/debug.tsx

@@ -28,7 +28,10 @@ export interface OneBotApiDebugProps {
 const OneBotApiDebug: React.FC<OneBotApiDebugProps> = (props) => {
   const { path, data } = props
   const url = new URL(window.location.origin).href
-  const defaultHttpUrl = url.replace(':6099', ':3000')
+  let defaultHttpUrl = url.replace(':6099', ':3000')
+  if (defaultHttpUrl.endsWith('/')) {
+    defaultHttpUrl = defaultHttpUrl.slice(0, -1)
+  }
   const [httpConfig, setHttpConfig] = useState({
     url: defaultHttpUrl,
     token: ''

napcat.webui/src/controllers/webui_manager.ts

@@ -24,6 +24,14 @@ export default class WebUIManager {
     return data.data.Credential
   }
 
+  public static async proxy<T>(url = '') {
+    const data = await serverRequest.get<ServerResponse<string>>(
+      '/base/proxy?url=' + encodeURIComponent(url)
+    )
+    data.data.data = JSON.parse(data.data.data)
+    return  data.data as ServerResponse<T>
+  }
+
   public static async getPackageInfo() {
     const { data } =
       await serverRequest.get<ServerResponse<PackageInfo>>('/base/PackageInfo')

napcat.webui/src/pages/dashboard/config/index.tsx

@@ -1,12 +1,14 @@
 import { Tab, Tabs } from '@heroui/tabs'
 import { useLocalStorage } from '@uidotdev/usehooks'
-import { useEffect } from 'react'
+import { useEffect, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import toast from 'react-hot-toast'
 import { useMediaQuery } from 'react-responsive'
 
 import key from '@/const/key'
 
+import PageLoading from '@/components/page_loading'
+
 import useConfig from '@/hooks/use-config'
 import useMusic from '@/hooks/use-music'
 
@@ -15,6 +17,7 @@ import WebUIConfigCard from './webui'
 
 export default function ConfigPage() {
   const { config, saveConfigWithoutNetwork, refreshConfig } = useConfig()
+  const [loading, setLoading] = useState(false)
   const {
     control: onebotControl,
     handleSubmit: handleOnebotSubmit,
@@ -82,13 +85,16 @@ export default function ConfigPage() {
     }
   })
 
-  const onRefresh = async () => {
+  const onRefresh = async (shotTip = true) => {
     try {
+      setLoading(true)
       await refreshConfig()
-      toast.success('刷新成功')
+      if (shotTip) toast.success('刷新成功')
     } catch (error) {
       const msg = (error as Error).message
       toast.error(`刷新失败: ${msg}`)
+    } finally {
+      setLoading(false)
     }
   }
 
@@ -97,6 +103,10 @@ export default function ConfigPage() {
     resetWebUI()
   }, [config])
 
+  useEffect(() => {
+    onRefresh(false)
+  }, [])
+
   return (
     <section className="w-[1000px] max-w-full md:mx-auto gap-4 py-8 px-2 md:py-10">
       <Tabs
@@ -106,12 +116,13 @@ export default function ConfigPage() {
         isVertical={isMediumUp}
         classNames={{
           tabList: 'sticky flex top-14 bg-opacity-50 backdrop-blur-sm',
-          panel: 'w-full',
+          panel: 'w-full relative',
           base: 'md:!w-auto flex-grow-0 flex-shrink-0 mr-0',
           cursor: 'bg-opacity-60 backdrop-blur-sm'
         }}
       >
         <Tab title="OneBot配置" key="onebot">
+          <PageLoading loading={loading} />
           <OneBotConfigCard
             isSubmitting={isOnebotSubmitting}
             onRefresh={onRefresh}

napcat.webui/src/utils/music.ts

@@ -6,17 +6,17 @@ import type {
   Music163URLResponse
 } from '@/types/music'
 
-import { request } from './request'
-
+import WebUIManager from '@/controllers/webui_manager'
 /**
  * 获取网易云音乐歌单
  * @param id 歌单id
  * @returns 歌单信息
  */
 export const get163MusicList = async (id: string) => {
-  const res = await request.get<Music163ListResponse>(
-    `https://wavesgame.top/playlist/track/all?id=${id}`
-  )
+  let res = await WebUIManager.proxy<Music163ListResponse>('https://wavesgame.top/playlist/track/all?id=' + id);
+  // const res = await request.get<Music163ListResponse>(
+  //   `https://wavesgame.top/playlist/track/all?id=${id}`
+  // )
   if (res?.data?.code !== 200) {
     throw new Error('获取歌曲列表失败')
   }
@@ -39,7 +39,7 @@ export const getSongsURL = async (ids: number[]) => {
   }, [] as number[][])
   const res = await Promise.all(
     _ids.map(async (id) => {
-      const res = await request.get<Music163URLResponse>(
+      const res = await WebUIManager.proxy<Music163URLResponse>(
         `https://wavesgame.top/song/url?id=${id.join(',')}`
       )
       if (res?.data?.code !== 200) {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.4.6",
+  "version": "4.4.9",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.4.6';
+export const napCatVersion = '4.4.9';

src/webui/src/api/Proxy.ts

@@ -0,0 +1,14 @@
+import { RequestHandler } from "express";
+import { RequestUtil } from "@/common/request";
+import { sendError, sendSuccess } from "../utils/response";
+
+export const GetProxyHandler: RequestHandler = async (req, res) => {
+    let { url } = req.query;
+    if (url && typeof url === "string") {
+        url = decodeURIComponent(url);
+        const responseText = await RequestUtil.HttpGetText(url);
+        res.send(sendSuccess(res, responseText));
+    } else {
+        res.send(sendError(res, 'url参数不合法'));
+    }
+};

src/webui/src/router/Base.ts

@@ -1,11 +1,12 @@
 import { Router } from 'express';
 import { PackageInfoHandler, QQVersionHandler } from '../api/BaseInfo';
 import { StatusRealTimeHandler } from "@webapi/api/Status";
+import { GetProxyHandler } from '../api/Proxy';
 
 const router = Router();
 // router: 获取nc的package.json信息
 router.get('/QQVersion', QQVersionHandler);
 router.get('/PackageInfo', PackageInfoHandler);
 router.get('/GetSysStatusRealTime', StatusRealTimeHandler);
-
+router.get('/proxy', GetProxyHandler);
 export { router as BaseRouter };