feat: sisi的妙妙rkey

refactor: 即刻起逐出piscina

README.md

@@ -64,4 +64,4 @@ NapCat 在设计理念下遵守 OneBot 规范大多数要求并且积极改进
 
 ## 开源附加
 
-任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**本仓库仅用于提高IM易用性，实现类似Hook推送，此外，禁止任何项目未经仓库主作者授权二次分发或基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**
+任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**本仓库仅用于提高易用性，实现消息推送类功能，此外，禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**

manifest.json

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

napcat.webui/package.json

@@ -13,6 +13,7 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
+    "@heroui/accordion": "^2.2.8",
     "@heroui/avatar": "2.2.7",
     "@heroui/breadcrumbs": "2.2.7",
     "@heroui/button": "2.2.10",
@@ -64,6 +65,7 @@
     "qrcode.react": "^4.2.0",
     "quill": "^2.0.3",
     "react": "^19.0.0",
+    "react-color": "^2.19.3",
     "react-dom": "^19.0.0",
     "react-dropzone": "^14.3.5",
     "react-error-boundary": "^5.0.0",

napcat.webui/src/components/ColorPicker.tsx

@@ -0,0 +1,36 @@
+import { Popover, PopoverContent, PopoverTrigger } from '@heroui/popover'
+import React from 'react'
+import { ColorResult, SketchPicker } from 'react-color'
+
+// 假定 heroui 提供的 Popover组件
+
+interface ColorPickerProps {
+  color: string
+  onChange: (color: ColorResult) => void
+}
+
+const ColorPicker: React.FC<ColorPickerProps> = ({ color, onChange }) => {
+  const handleChange = (colorResult: ColorResult) => {
+    onChange(colorResult)
+  }
+
+  return (
+    <Popover triggerScaleOnOpen={false}>
+      <PopoverTrigger>
+        <div
+          className="w-36 h-8 rounded-md cursor-pointer border border-content4"
+          style={{ background: color }}
+        />
+      </PopoverTrigger>
+      <PopoverContent>
+        <SketchPicker
+          color={color}
+          onChange={handleChange}
+          className="!bg-transparent !shadow-none"
+        />
+      </PopoverContent>
+    </Popover>
+  )
+}
+
+export default ColorPicker

napcat.webui/src/components/button/save_buttons.tsx

@@ -1,4 +1,5 @@
 import { Button } from '@heroui/button'
+import clsx from 'clsx'
 import toast from 'react-hot-toast'
 import { IoMdRefresh } from 'react-icons/io'
 
@@ -7,15 +8,22 @@ export interface SaveButtonsProps {
   reset: () => void
   refresh?: () => void
   isSubmitting: boolean
+  className?: string
 }
 
 const SaveButtons: React.FC<SaveButtonsProps> = ({
   onSubmit,
   reset,
   isSubmitting,
-  refresh
+  refresh,
+  className
 }) => (
-  <div className="max-w-full mx-3 w-96 flex flex-col justify-center gap-3">
+  <div
+    className={clsx(
+      'max-w-full mx-3 w-96 flex flex-col justify-center gap-3',
+      className
+    )}
+  >
     <div className="flex items-center justify-center gap-2 mt-5">
       <Button
         color="default"

napcat.webui/src/components/file_manage/file_table.tsx

@@ -82,7 +82,7 @@ export default function FileTable({
     setPreviewImages([])
     setPreviewIndex(0)
     setShowImage(false)
-  }, [files])
+  }, [currentPath])
 
   const onPreviewImage = (name: string, images: PreviewImage[]) => {
     const index = images.findIndex((image) => image.key === name)

napcat.webui/src/components/file_manage/image_name_button.tsx

@@ -74,6 +74,9 @@ export default function ImageNameButton({
             src={data}
             alt={name}
             className="w-8 h-8 flex-shrink-0"
+            classNames={{
+              wrapper: 'w-8 h-8 flex-shrink-0'
+            }}
             radius="sm"
           />
         )

napcat.webui/src/components/input/file_input.tsx

@@ -0,0 +1,69 @@
+import { Button } from '@heroui/button'
+import { Input } from '@heroui/input'
+import { useRef, useState } from 'react'
+
+export interface FileInputProps {
+  onChange: (file: File) => Promise<void> | void
+  onDelete?: () => Promise<void> | void
+  label?: string
+  accept?: string
+}
+
+const FileInput: React.FC<FileInputProps> = ({
+  onChange,
+  onDelete,
+  label,
+  accept
+}) => {
+  const inputRef = useRef<HTMLInputElement>(null)
+  const [isLoading, setIsLoading] = useState(false)
+  return (
+    <div className="flex items-end gap-2">
+      <div className="flex-grow">
+        <Input
+          isDisabled={isLoading}
+          ref={inputRef}
+          label={label}
+          type="file"
+          placeholder="选择文件"
+          accept={accept}
+          onChange={async (e) => {
+            try {
+              setIsLoading(true)
+              const file = e.target.files?.[0]
+              if (file) {
+                await onChange(file)
+              }
+            } catch (error) {
+              console.error(error)
+            } finally {
+              setIsLoading(false)
+              if (inputRef.current) inputRef.current.value = ''
+            }
+          }}
+        />
+      </div>
+      <Button
+        isDisabled={isLoading}
+        onPress={async () => {
+          try {
+            setIsLoading(true)
+            if (onDelete) await onDelete()
+          } catch (error) {
+            console.error(error)
+          } finally {
+            setIsLoading(false)
+            if (inputRef.current) inputRef.current.value = ''
+          }
+        }}
+        color="primary"
+        variant="flat"
+        size="sm"
+      >
+        删除
+      </Button>
+    </div>
+  )
+}
+
+export default FileInput

napcat.webui/src/components/sidebar/menus.tsx

@@ -58,14 +58,13 @@ const renderItems = (items: MenuItem[], children = false) => {
           color="primary"
           endContent={
             canOpen ? (
-              // div实现箭头V效果
               <div
                 className={clsx(
                   'ml-auto relative w-3 h-3 transition-transform',
                   open && 'transform rotate-180',
                   isActive
                     ? 'text-primary-500'
-                    : 'text-red-300 dark:text-white',
+                    : 'text-primary-200 dark:text-white',
                   'before:rounded-full',
                   'before:content-[""]',
                   'before:block',
@@ -98,7 +97,7 @@ const renderItems = (items: MenuItem[], children = false) => {
                   'w-3 h-1.5 rounded-full ml-auto shadow-lg',
                   isActive
                     ? 'bg-primary-500 animate-spinner-ease-spin'
-                    : 'bg-red-300 dark:bg-white'
+                    : 'bg-primary-200 dark:bg-white'
                 )}
               />
             )

napcat.webui/src/components/system_info.tsx

@@ -34,7 +34,7 @@ const SystemInfoItem: React.FC<SystemInfoItemProps> = ({
   endContent
 }) => {
   return (
-    <div className="flex text-sm gap-1 p-2 items-center shadow-sm shadow-primary-50 dark:shadow-primary-100 rounded text-primary-400">
+    <div className="flex text-sm gap-1 p-2 items-center shadow-sm shadow-primary-100 dark:shadow-primary-100 rounded text-primary-400">
       {icon}
       <div className="w-24">{title}</div>
       <div className="text-primary-200">{value}</div>
@@ -234,7 +234,7 @@ const SystemInfo: React.FC<SystemInfoProps> = (props) => {
     error: qqVersionError
   } = useRequest(WebUIManager.getQQVersion)
   return (
-    <Card className="bg-opacity-60 shadow-sm shadow-primary-50 dark:shadow-primary-100 overflow-visible flex-1">
+    <Card className="bg-opacity-60 shadow-sm shadow-primary-100 dark:shadow-primary-100 overflow-visible flex-1">
       <CardHeader className="pb-0 items-center gap-1 text-primary-500 font-extrabold">
         <FaCircleInfo className="text-lg" />
         <span>系统信息</span>

napcat.webui/src/components/system_status_display.tsx

@@ -24,7 +24,7 @@ const SystemStatusItem: React.FC<SystemStatusItemProps> = ({
   return (
     <div
       className={clsx(
-        'shadow-sm p-2 rounded-md text-sm bg-content1 bg-opacity-30',
+        'shadow-sm shadow-primary-100 p-2 rounded-md text-sm bg-content1 bg-opacity-30',
         size === 'lg' ? 'col-span-2' : 'col-span-1 flex justify-between'
       )}
     >
@@ -55,7 +55,7 @@ const SystemStatusDisplay: React.FC<SystemStatusDisplayProps> = ({ data }) => {
   }
 
   return (
-    <Card className="bg-opacity-60 shadow-sm shadow-primary-50 dark:shadow-primary-100 col-span-1 lg:col-span-2 relative overflow-hidden">
+    <Card className="bg-opacity-60 shadow-sm shadow-primary-100 col-span-1 lg:col-span-2 relative overflow-hidden">
       <div className="absolute h-full right-0 top-0">
         <Image
           src={bkg}

napcat.webui/src/const/themes.ts

@@ -0,0 +1,6 @@
+import heroui from './themes/heroui'
+import nc_pink from './themes/nc_pink'
+
+const themes: ThemeInfo[] = [nc_pink, heroui]
+
+export default themes

napcat.webui/src/const/themes/heroui.ts

@@ -0,0 +1,256 @@
+const theme: ThemeConfig = {
+  dark: {
+    '--heroui-background': '0 0% 0%',
+    '--heroui-foreground-50': '240 5.88% 10%',
+    '--heroui-foreground-100': '240 3.7% 15.88%',
+    '--heroui-foreground-200': '240 5.26% 26.08%',
+    '--heroui-foreground-300': '240 5.2% 33.92%',
+    '--heroui-foreground-400': '240 3.83% 46.08%',
+    '--heroui-foreground-500': '240 5.03% 64.9%',
+    '--heroui-foreground-600': '240 4.88% 83.92%',
+    '--heroui-foreground-700': '240 5.88% 90%',
+    '--heroui-foreground-800': '240 4.76% 95.88%',
+    '--heroui-foreground-900': '0 0% 98.04%',
+    '--heroui-foreground': '210 5.56% 92.94%',
+    '--heroui-focus': '212.01999999999998 100% 46.67%',
+    '--heroui-overlay': '0 0% 0%',
+    '--heroui-divider': '0 0% 100%',
+    '--heroui-divider-opacity': '0.15',
+    '--heroui-content1': '240 5.88% 10%',
+    '--heroui-content1-foreground': '0 0% 98.04%',
+    '--heroui-content2': '240 3.7% 15.88%',
+    '--heroui-content2-foreground': '240 4.76% 95.88%',
+    '--heroui-content3': '240 5.26% 26.08%',
+    '--heroui-content3-foreground': '240 5.88% 90%',
+    '--heroui-content4': '240 5.2% 33.92%',
+    '--heroui-content4-foreground': '240 4.88% 83.92%',
+    '--heroui-default-50': '240 5.88% 10%',
+    '--heroui-default-100': '240 3.7% 15.88%',
+    '--heroui-default-200': '240 5.26% 26.08%',
+    '--heroui-default-300': '240 5.2% 33.92%',
+    '--heroui-default-400': '240 3.83% 46.08%',
+    '--heroui-default-500': '240 5.03% 64.9%',
+    '--heroui-default-600': '240 4.88% 83.92%',
+    '--heroui-default-700': '240 5.88% 90%',
+    '--heroui-default-800': '240 4.76% 95.88%',
+    '--heroui-default-900': '0 0% 98.04%',
+    '--heroui-default-foreground': '0 0% 100%',
+    '--heroui-default': '240 5.26% 26.08%',
+    '--heroui-danger-50': '340 84.91% 10.39%',
+    '--heroui-danger-100': '339.33 86.54% 20.39%',
+    '--heroui-danger-200': '339.11 85.99% 30.78%',
+    '--heroui-danger-300': '339 86.54% 40.78%',
+    '--heroui-danger-400': '339.2 90.36% 51.18%',
+    '--heroui-danger-500': '339 90% 60.78%',
+    '--heroui-danger-600': '339.11 90.6% 70.78%',
+    '--heroui-danger-700': '339.33 90% 80.39%',
+    '--heroui-danger-800': '340 91.84% 90.39%',
+    '--heroui-danger-900': '339.13 92% 95.1%',
+    '--heroui-danger-foreground': '0 0% 100%',
+    '--heroui-danger': '339.2 90.36% 51.18%',
+    '--heroui-primary-50': '211.84 100% 9.61%',
+    '--heroui-primary-100': '211.84 100% 19.22%',
+    '--heroui-primary-200': '212.24 100% 28.82%',
+    '--heroui-primary-300': '212.14 100% 38.43%',
+    '--heroui-primary-400': '212.02 100% 46.67%',
+    '--heroui-primary-500': '212.14 92.45% 58.43%',
+    '--heroui-primary-600': '212.24 92.45% 68.82%',
+    '--heroui-primary-700': '211.84 92.45% 79.22%',
+    '--heroui-primary-800': '211.84 92.45% 89.61%',
+    '--heroui-primary-900': '212.5 92.31% 94.9%',
+    '--heroui-primary-foreground': '0 0% 100%',
+    '--heroui-primary': '212.02 100% 46.67%',
+    '--heroui-secondary-50': '270 66.67% 9.41%',
+    '--heroui-secondary-100': '270 66.67% 18.82%',
+    '--heroui-secondary-200': '270 66.67% 28.24%',
+    '--heroui-secondary-300': '270 66.67% 37.65%',
+    '--heroui-secondary-400': '270 66.67% 47.06%',
+    '--heroui-secondary-500': '270 59.26% 57.65%',
+    '--heroui-secondary-600': '270 59.26% 68.24%',
+    '--heroui-secondary-700': '270 59.26% 78.82%',
+    '--heroui-secondary-800': '270 59.26% 89.41%',
+    '--heroui-secondary-900': '270 61.54% 94.9%',
+    '--heroui-secondary-foreground': '0 0% 100%',
+    '--heroui-secondary': '270 59.26% 57.65%',
+    '--heroui-success-50': '145.71 77.78% 8.82%',
+    '--heroui-success-100': '146.2 79.78% 17.45%',
+    '--heroui-success-200': '145.79 79.26% 26.47%',
+    '--heroui-success-300': '146.01 79.89% 35.1%',
+    '--heroui-success-400': '145.96 79.46% 43.92%',
+    '--heroui-success-500': '146.01 62.45% 55.1%',
+    '--heroui-success-600': '145.79 62.57% 66.47%',
+    '--heroui-success-700': '146.2 61.74% 77.45%',
+    '--heroui-success-800': '145.71 61.4% 88.82%',
+    '--heroui-success-900': '146.67 64.29% 94.51%',
+    '--heroui-success-foreground': '0 0% 0%',
+    '--heroui-success': '145.96 79.46% 43.92%',
+    '--heroui-warning-50': '37.14 75% 10.98%',
+    '--heroui-warning-100': '37.14 75% 21.96%',
+    '--heroui-warning-200': '36.96 73.96% 33.14%',
+    '--heroui-warning-300': '37.01 74.22% 44.12%',
+    '--heroui-warning-400': '37.03 91.27% 55.1%',
+    '--heroui-warning-500': '37.01 91.26% 64.12%',
+    '--heroui-warning-600': '36.96 91.24% 73.14%',
+    '--heroui-warning-700': '37.14 91.3% 81.96%',
+    '--heroui-warning-800': '37.14 91.3% 90.98%',
+    '--heroui-warning-900': '54.55 91.67% 95.29%',
+    '--heroui-warning-foreground': '0 0% 0%',
+    '--heroui-warning': '37.03 91.27% 55.1%',
+    '--heroui-code-background': '240 5.56% 7.06%',
+    '--heroui-strong': '190.14 94.67% 44.12%',
+    '--heroui-code-mdx': '190.14 94.67% 44.12%',
+    '--heroui-divider-weight': '1px',
+    '--heroui-disabled-opacity': '.5',
+    '--heroui-font-size-tiny': '0.75rem',
+    '--heroui-font-size-small': '0.875rem',
+    '--heroui-font-size-medium': '1rem',
+    '--heroui-font-size-large': '1.125rem',
+    '--heroui-line-height-tiny': '1rem',
+    '--heroui-line-height-small': '1.25rem',
+    '--heroui-line-height-medium': '1.5rem',
+    '--heroui-line-height-large': '1.75rem',
+    '--heroui-radius-small': '8px',
+    '--heroui-radius-medium': '12px',
+    '--heroui-radius-large': '14px',
+    '--heroui-border-width-small': '1px',
+    '--heroui-border-width-medium': '2px',
+    '--heroui-border-width-large': '3px',
+    '--heroui-box-shadow-small':
+      '0px 0px 5px 0px rgba(0, 0, 0, .05), 0px 2px 10px 0px rgba(0, 0, 0, .2), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-box-shadow-medium':
+      '0px 0px 15px 0px rgba(0, 0, 0, .06), 0px 2px 30px 0px rgba(0, 0, 0, .22), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-box-shadow-large':
+      '0px 0px 30px 0px rgba(0, 0, 0, .07), 0px 30px 60px 0px rgba(0, 0, 0, .26), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-hover-opacity': '.9'
+  },
+  light: {
+    '--heroui-background': '0 0% 100%',
+    '--heroui-foreground-50': '240 5.88% 95%',
+    '--heroui-foreground-100': '240 3.7% 90%',
+    '--heroui-foreground-200': '240 5.26% 80%',
+    '--heroui-foreground-300': '240 5.2% 70%',
+    '--heroui-foreground-400': '240 3.83% 60%',
+    '--heroui-foreground-500': '240 5.03% 50%',
+    '--heroui-foreground-600': '240 4.88% 40%',
+    '--heroui-foreground-700': '240 5.88% 30%',
+    '--heroui-foreground-800': '240 4.76% 20%',
+    '--heroui-foreground-900': '0 0% 10%',
+    '--heroui-foreground': '210 5.56% 7.06%',
+    '--heroui-focus': '212.01999999999998 100% 53.33%',
+    '--heroui-overlay': '0 0% 100%',
+    '--heroui-divider': '0 0% 0%',
+    '--heroui-divider-opacity': '0.85',
+    '--heroui-content1': '240 5.88% 95%',
+    '--heroui-content1-foreground': '0 0% 10%',
+    '--heroui-content2': '240 3.7% 90%',
+    '--heroui-content2-foreground': '240 4.76% 20%',
+    '--heroui-content3': '240 5.26% 80%',
+    '--heroui-content3-foreground': '240 5.88% 30%',
+    '--heroui-content4': '240 5.2% 70%',
+    '--heroui-content4-foreground': '240 4.88% 40%',
+    '--heroui-default-50': '240 5.88% 95%',
+    '--heroui-default-100': '240 3.7% 90%',
+    '--heroui-default-200': '240 5.26% 80%',
+    '--heroui-default-300': '240 5.2% 70%',
+    '--heroui-default-400': '240 3.83% 60%',
+    '--heroui-default-500': '240 5.03% 50%',
+    '--heroui-default-600': '240 4.88% 40%',
+    '--heroui-default-700': '240 5.88% 30%',
+    '--heroui-default-800': '240 4.76% 20%',
+    '--heroui-default-900': '0 0% 10%',
+    '--heroui-default-foreground': '0 0% 0%',
+    '--heroui-default': '240 5.26% 80%',
+    '--heroui-danger-50': '339.13 92% 95.1%',
+    '--heroui-danger-100': '340 91.84% 90.39%',
+    '--heroui-danger-200': '339.33 90% 80.39%',
+    '--heroui-danger-300': '339.11 90.6% 70.78%',
+    '--heroui-danger-400': '339 90% 60.78%',
+    '--heroui-danger-500': '339.2 90.36% 51.18%',
+    '--heroui-danger-600': '339 86.54% 40.78%',
+    '--heroui-danger-700': '339.11 85.99% 30.78%',
+    '--heroui-danger-800': '339.33 86.54% 20.39%',
+    '--heroui-danger-900': '340 84.91% 10.39%',
+    '--heroui-danger-foreground': '0 0% 100%',
+    '--heroui-danger': '339.2 90.36% 51.18%',
+    '--heroui-primary-50': '212.5 92.31% 94.9%',
+    '--heroui-primary-100': '211.84 92.45% 89.61%',
+    '--heroui-primary-200': '211.84 92.45% 79.22%',
+    '--heroui-primary-300': '212.24 92.45% 68.82%',
+    '--heroui-primary-400': '212.14 92.45% 58.43%',
+    '--heroui-primary-500': '212.02 100% 46.67%',
+    '--heroui-primary-600': '212.14 100% 38.43%',
+    '--heroui-primary-700': '212.24 100% 28.82%',
+    '--heroui-primary-800': '211.84 100% 19.22%',
+    '--heroui-primary-900': '211.84 100% 9.61%',
+    '--heroui-primary-foreground': '0 0% 100%',
+    '--heroui-primary': '212.02 100% 46.67%',
+    '--heroui-secondary-50': '270 61.54% 94.9%',
+    '--heroui-secondary-100': '270 59.26% 89.41%',
+    '--heroui-secondary-200': '270 59.26% 78.82%',
+    '--heroui-secondary-300': '270 59.26% 68.24%',
+    '--heroui-secondary-400': '270 59.26% 57.65%',
+    '--heroui-secondary-500': '270 66.67% 47.06%',
+    '--heroui-secondary-600': '270 66.67% 37.65%',
+    '--heroui-secondary-700': '270 66.67% 28.24%',
+    '--heroui-secondary-800': '270 66.67% 18.82%',
+    '--heroui-secondary-900': '270 66.67% 9.41%',
+    '--heroui-secondary-foreground': '0 0% 100%',
+    '--heroui-secondary': '270 66.67% 47.06%',
+    '--heroui-success-50': '146.67 64.29% 94.51%',
+    '--heroui-success-100': '145.71 61.4% 88.82%',
+    '--heroui-success-200': '146.2 61.74% 77.45%',
+    '--heroui-success-300': '145.79 62.57% 66.47%',
+    '--heroui-success-400': '146.01 62.45% 55.1%',
+    '--heroui-success-500': '145.96 79.46% 43.92%',
+    '--heroui-success-600': '146.01 79.89% 35.1%',
+    '--heroui-success-700': '145.79 79.26% 26.47%',
+    '--heroui-success-800': '146.2 79.78% 17.45%',
+    '--heroui-success-900': '145.71 77.78% 8.82%',
+    '--heroui-success-foreground': '0 0% 0%',
+    '--heroui-success': '145.96 79.46% 43.92%',
+    '--heroui-warning-50': '54.55 91.67% 95.29%',
+    '--heroui-warning-100': '37.14 91.3% 90.98%',
+    '--heroui-warning-200': '37.14 91.3% 81.96%',
+    '--heroui-warning-300': '36.96 91.24% 73.14%',
+    '--heroui-warning-400': '37.01 91.26% 64.12%',
+    '--heroui-warning-500': '37.03 91.27% 55.1%',
+    '--heroui-warning-600': '37.01 74.22% 44.12%',
+    '--heroui-warning-700': '36.96 73.96% 33.14%',
+    '--heroui-warning-800': '37.14 75% 21.96%',
+    '--heroui-warning-900': '37.14 75% 10.98%',
+    '--heroui-warning-foreground': '0 0% 0%',
+    '--heroui-warning': '37.03 91.27% 55.1%',
+    '--heroui-code-background': '221.25 17.39% 18.04%',
+    '--heroui-strong': '316.95 100% 65.29%',
+    '--heroui-code-mdx': '316.95 100% 65.29%',
+    '--heroui-divider-weight': '1px',
+    '--heroui-disabled-opacity': '.5',
+    '--heroui-font-size-tiny': '0.75rem',
+    '--heroui-font-size-small': '0.875rem',
+    '--heroui-font-size-medium': '1rem',
+    '--heroui-font-size-large': '1.125rem',
+    '--heroui-line-height-tiny': '1rem',
+    '--heroui-line-height-small': '1.25rem',
+    '--heroui-line-height-medium': '1.5rem',
+    '--heroui-line-height-large': '1.75rem',
+    '--heroui-radius-small': '8px',
+    '--heroui-radius-medium': '12px',
+    '--heroui-radius-large': '14px',
+    '--heroui-border-width-small': '1px',
+    '--heroui-border-width-medium': '2px',
+    '--heroui-border-width-large': '3px',
+    '--heroui-box-shadow-small':
+      '0px 0px 5px 0px rgba(0, 0, 0, .02), 0px 2px 10px 0px rgba(0, 0, 0, .06), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-box-shadow-medium':
+      '0px 0px 15px 0px rgba(0, 0, 0, .03), 0px 2px 30px 0px rgba(0, 0, 0, .08), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-box-shadow-large':
+      '0px 0px 30px 0px rgba(0, 0, 0, .04), 0px 30px 60px 0px rgba(0, 0, 0, .12), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-hover-opacity': '.8'
+  }
+}
+export default {
+  theme,
+  author: 'HeroUI',
+  name: 'heroui',
+  description: 'HeroUI Default Theme'
+} satisfies ThemeInfo

napcat.webui/src/const/themes/nc_pink.ts

@@ -0,0 +1,256 @@
+const theme: ThemeConfig = {
+  dark: {
+    '--heroui-background': '0 0% 0%',
+    '--heroui-foreground-50': '240 5.88% 10%',
+    '--heroui-foreground-100': '240 3.7% 15.88%',
+    '--heroui-foreground-200': '240 5.26% 26.08%',
+    '--heroui-foreground-300': '240 5.2% 33.92%',
+    '--heroui-foreground-400': '240 3.83% 46.08%',
+    '--heroui-foreground-500': '240 5.03% 64.9%',
+    '--heroui-foreground-600': '240 4.88% 83.92%',
+    '--heroui-foreground-700': '240 5.88% 90%',
+    '--heroui-foreground-800': '240 4.76% 95.88%',
+    '--heroui-foreground-900': '0 0% 98.04%',
+    '--heroui-foreground': '210 5.56% 92.94%',
+    '--heroui-focus': '212.01999999999998 100% 46.67%',
+    '--heroui-overlay': '0 0% 0%',
+    '--heroui-divider': '0 0% 100%',
+    '--heroui-divider-opacity': '0.15',
+    '--heroui-content1': '240 5.88% 10%',
+    '--heroui-content1-foreground': '0 0% 98.04%',
+    '--heroui-content2': '240 3.7% 15.88%',
+    '--heroui-content2-foreground': '240 4.76% 95.88%',
+    '--heroui-content3': '240 5.26% 26.08%',
+    '--heroui-content3-foreground': '240 5.88% 90%',
+    '--heroui-content4': '240 5.2% 33.92%',
+    '--heroui-content4-foreground': '240 4.88% 83.92%',
+    '--heroui-default-50': '240 5.88% 10%',
+    '--heroui-default-100': '240 3.7% 15.88%',
+    '--heroui-default-200': '240 5.26% 26.08%',
+    '--heroui-default-300': '240 5.2% 33.92%',
+    '--heroui-default-400': '240 3.83% 46.08%',
+    '--heroui-default-500': '240 5.03% 64.9%',
+    '--heroui-default-600': '240 4.88% 83.92%',
+    '--heroui-default-700': '240 5.88% 90%',
+    '--heroui-default-800': '240 4.76% 95.88%',
+    '--heroui-default-900': '0 0% 98.04%',
+    '--heroui-default-foreground': '0 0% 100%',
+    '--heroui-default': '240 5.26% 26.08%',
+    '--heroui-danger-50': '301.89 82.61% 22.55%',
+    '--heroui-danger-100': '308.18 76.39% 28.24%',
+    '--heroui-danger-200': '313.85 70.65% 36.08%',
+    '--heroui-danger-300': '319.73 65.64% 44.51%',
+    '--heroui-danger-400': '325.82 69.62% 53.53%',
+    '--heroui-danger-500': '331.82 75% 65.49%',
+    '--heroui-danger-600': '337.84 83.46% 73.92%',
+    '--heroui-danger-700': '343.42 90.48% 83.53%',
+    '--heroui-danger-800': '350.53 90.48% 91.76%',
+    '--heroui-danger-900': '324 90.91% 95.69%',
+    '--heroui-danger-foreground': '0 0% 100%',
+    '--heroui-danger': '325.82 69.62% 53.53%',
+    '--heroui-primary-50': '340 84.91% 10.39%',
+    '--heroui-primary-100': '339.33 86.54% 20.39%',
+    '--heroui-primary-200': '339.11 85.99% 30.78%',
+    '--heroui-primary-300': '339 86.54% 40.78%',
+    '--heroui-primary-400': '339.2 90.36% 51.18%',
+    '--heroui-primary-500': '339 90% 60.78%',
+    '--heroui-primary-600': '339.11 90.6% 70.78%',
+    '--heroui-primary-700': '339.33 90% 80.39%',
+    '--heroui-primary-800': '340 91.84% 90.39%',
+    '--heroui-primary-900': '339.13 92% 95.1%',
+    '--heroui-primary-foreground': '0 0% 100%',
+    '--heroui-primary': '339.2 90.36% 51.18%',
+    '--heroui-secondary-50': '270 66.67% 9.41%',
+    '--heroui-secondary-100': '270 66.67% 18.82%',
+    '--heroui-secondary-200': '270 66.67% 28.24%',
+    '--heroui-secondary-300': '270 66.67% 37.65%',
+    '--heroui-secondary-400': '270 66.67% 47.06%',
+    '--heroui-secondary-500': '270 59.26% 57.65%',
+    '--heroui-secondary-600': '270 59.26% 68.24%',
+    '--heroui-secondary-700': '270 59.26% 78.82%',
+    '--heroui-secondary-800': '270 59.26% 89.41%',
+    '--heroui-secondary-900': '270 61.54% 94.9%',
+    '--heroui-secondary-foreground': '0 0% 100%',
+    '--heroui-secondary': '270 59.26% 57.65%',
+    '--heroui-success-50': '145.71 77.78% 8.82%',
+    '--heroui-success-100': '146.2 79.78% 17.45%',
+    '--heroui-success-200': '145.79 79.26% 26.47%',
+    '--heroui-success-300': '146.01 79.89% 35.1%',
+    '--heroui-success-400': '145.96 79.46% 43.92%',
+    '--heroui-success-500': '146.01 62.45% 55.1%',
+    '--heroui-success-600': '145.79 62.57% 66.47%',
+    '--heroui-success-700': '146.2 61.74% 77.45%',
+    '--heroui-success-800': '145.71 61.4% 88.82%',
+    '--heroui-success-900': '146.67 64.29% 94.51%',
+    '--heroui-success-foreground': '0 0% 0%',
+    '--heroui-success': '145.96 79.46% 43.92%',
+    '--heroui-warning-50': '37.14 75% 10.98%',
+    '--heroui-warning-100': '37.14 75% 21.96%',
+    '--heroui-warning-200': '36.96 73.96% 33.14%',
+    '--heroui-warning-300': '37.01 74.22% 44.12%',
+    '--heroui-warning-400': '37.03 91.27% 55.1%',
+    '--heroui-warning-500': '37.01 91.26% 64.12%',
+    '--heroui-warning-600': '36.96 91.24% 73.14%',
+    '--heroui-warning-700': '37.14 91.3% 81.96%',
+    '--heroui-warning-800': '37.14 91.3% 90.98%',
+    '--heroui-warning-900': '54.55 91.67% 95.29%',
+    '--heroui-warning-foreground': '0 0% 0%',
+    '--heroui-warning': '37.03 91.27% 55.1%',
+    '--heroui-code-background': '240 5.56% 7.06%',
+    '--heroui-strong': '190.14 94.67% 44.12%',
+    '--heroui-code-mdx': '190.14 94.67% 44.12%',
+    '--heroui-divider-weight': '1px',
+    '--heroui-disabled-opacity': '.5',
+    '--heroui-font-size-tiny': '0.75rem',
+    '--heroui-font-size-small': '0.875rem',
+    '--heroui-font-size-medium': '1rem',
+    '--heroui-font-size-large': '1.125rem',
+    '--heroui-line-height-tiny': '1rem',
+    '--heroui-line-height-small': '1.25rem',
+    '--heroui-line-height-medium': '1.5rem',
+    '--heroui-line-height-large': '1.75rem',
+    '--heroui-radius-small': '8px',
+    '--heroui-radius-medium': '12px',
+    '--heroui-radius-large': '14px',
+    '--heroui-border-width-small': '1px',
+    '--heroui-border-width-medium': '2px',
+    '--heroui-border-width-large': '3px',
+    '--heroui-box-shadow-small':
+      '0px 0px 5px 0px rgba(0, 0, 0, .05), 0px 2px 10px 0px rgba(0, 0, 0, .2), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-box-shadow-medium':
+      '0px 0px 15px 0px rgba(0, 0, 0, .06), 0px 2px 30px 0px rgba(0, 0, 0, .22), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-box-shadow-large':
+      '0px 0px 30px 0px rgba(0, 0, 0, .07), 0px 30px 60px 0px rgba(0, 0, 0, .26), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-hover-opacity': '.9'
+  },
+  light: {
+    '--heroui-background': '0 0% 100%',
+    '--heroui-foreground-50': '240 5.88% 95%',
+    '--heroui-foreground-100': '240 3.7% 90%',
+    '--heroui-foreground-200': '240 5.26% 80%',
+    '--heroui-foreground-300': '240 5.2% 70%',
+    '--heroui-foreground-400': '240 3.83% 60%',
+    '--heroui-foreground-500': '240 5.03% 50%',
+    '--heroui-foreground-600': '240 4.88% 40%',
+    '--heroui-foreground-700': '240 5.88% 30%',
+    '--heroui-foreground-800': '240 4.76% 20%',
+    '--heroui-foreground-900': '0 0% 10%',
+    '--heroui-foreground': '210 5.56% 7.06%',
+    '--heroui-focus': '212.01999999999998 100% 53.33%',
+    '--heroui-overlay': '0 0% 100%',
+    '--heroui-divider': '0 0% 0%',
+    '--heroui-divider-opacity': '0.85',
+    '--heroui-content1': '240 5.88% 95%',
+    '--heroui-content1-foreground': '0 0% 10%',
+    '--heroui-content2': '240 3.7% 90%',
+    '--heroui-content2-foreground': '240 4.76% 20%',
+    '--heroui-content3': '240 5.26% 80%',
+    '--heroui-content3-foreground': '240 5.88% 30%',
+    '--heroui-content4': '240 5.2% 70%',
+    '--heroui-content4-foreground': '240 4.88% 40%',
+    '--heroui-default-50': '240 5.88% 95%',
+    '--heroui-default-100': '240 3.7% 90%',
+    '--heroui-default-200': '240 5.26% 80%',
+    '--heroui-default-300': '240 5.2% 70%',
+    '--heroui-default-400': '240 3.83% 60%',
+    '--heroui-default-500': '240 5.03% 50%',
+    '--heroui-default-600': '240 4.88% 40%',
+    '--heroui-default-700': '240 5.88% 30%',
+    '--heroui-default-800': '240 4.76% 20%',
+    '--heroui-default-900': '0 0% 10%',
+    '--heroui-default-foreground': '0 0% 0%',
+    '--heroui-default': '240 5.26% 80%',
+    '--heroui-danger-50': '324 90.91% 95.69%',
+    '--heroui-danger-100': '350.53 90.48% 91.76%',
+    '--heroui-danger-200': '343.42 90.48% 83.53%',
+    '--heroui-danger-300': '337.84 83.46% 73.92%',
+    '--heroui-danger-400': '331.82 75% 65.49%',
+    '--heroui-danger-500': '325.82 69.62% 53.53%',
+    '--heroui-danger-600': '319.73 65.64% 44.51%',
+    '--heroui-danger-700': '313.85 70.65% 36.08%',
+    '--heroui-danger-800': '308.18 76.39% 28.24%',
+    '--heroui-danger-900': '301.89 82.61% 22.55%',
+    '--heroui-danger-foreground': '0 0% 100%',
+    '--heroui-danger': '325.82 69.62% 53.53%',
+    '--heroui-primary-50': '339.13 92% 95.1%',
+    '--heroui-primary-100': '340 91.84% 90.39%',
+    '--heroui-primary-200': '339.33 90% 80.39%',
+    '--heroui-primary-300': '339.11 90.6% 70.78%',
+    '--heroui-primary-400': '339 90% 60.78%',
+    '--heroui-primary-500': '339.2 90.36% 51.18%',
+    '--heroui-primary-600': '339 86.54% 40.78%',
+    '--heroui-primary-700': '339.11 85.99% 30.78%',
+    '--heroui-primary-800': '339.33 86.54% 20.39%',
+    '--heroui-primary-900': '340 84.91% 10.39%',
+    '--heroui-primary-foreground': '0 0% 100%',
+    '--heroui-primary': '339.2 90.36% 51.18%',
+    '--heroui-secondary-50': '270 61.54% 94.9%',
+    '--heroui-secondary-100': '270 59.26% 89.41%',
+    '--heroui-secondary-200': '270 59.26% 78.82%',
+    '--heroui-secondary-300': '270 59.26% 68.24%',
+    '--heroui-secondary-400': '270 59.26% 57.65%',
+    '--heroui-secondary-500': '270 66.67% 47.06%',
+    '--heroui-secondary-600': '270 66.67% 37.65%',
+    '--heroui-secondary-700': '270 66.67% 28.24%',
+    '--heroui-secondary-800': '270 66.67% 18.82%',
+    '--heroui-secondary-900': '270 66.67% 9.41%',
+    '--heroui-secondary-foreground': '0 0% 100%',
+    '--heroui-secondary': '270 66.67% 47.06%',
+    '--heroui-success-50': '146.67 64.29% 94.51%',
+    '--heroui-success-100': '145.71 61.4% 88.82%',
+    '--heroui-success-200': '146.2 61.74% 77.45%',
+    '--heroui-success-300': '145.79 62.57% 66.47%',
+    '--heroui-success-400': '146.01 62.45% 55.1%',
+    '--heroui-success-500': '145.96 79.46% 43.92%',
+    '--heroui-success-600': '146.01 79.89% 35.1%',
+    '--heroui-success-700': '145.79 79.26% 26.47%',
+    '--heroui-success-800': '146.2 79.78% 17.45%',
+    '--heroui-success-900': '145.71 77.78% 8.82%',
+    '--heroui-success-foreground': '0 0% 0%',
+    '--heroui-success': '145.96 79.46% 43.92%',
+    '--heroui-warning-50': '54.55 91.67% 95.29%',
+    '--heroui-warning-100': '37.14 91.3% 90.98%',
+    '--heroui-warning-200': '37.14 91.3% 81.96%',
+    '--heroui-warning-300': '36.96 91.24% 73.14%',
+    '--heroui-warning-400': '37.01 91.26% 64.12%',
+    '--heroui-warning-500': '37.03 91.27% 55.1%',
+    '--heroui-warning-600': '37.01 74.22% 44.12%',
+    '--heroui-warning-700': '36.96 73.96% 33.14%',
+    '--heroui-warning-800': '37.14 75% 21.96%',
+    '--heroui-warning-900': '37.14 75% 10.98%',
+    '--heroui-warning-foreground': '0 0% 0%',
+    '--heroui-warning': '37.03 91.27% 55.1%',
+    '--heroui-code-background': '221.25 17.39% 18.04%',
+    '--heroui-strong': '316.95 100% 65.29%',
+    '--heroui-code-mdx': '316.95 100% 65.29%',
+    '--heroui-divider-weight': '1px',
+    '--heroui-disabled-opacity': '.5',
+    '--heroui-font-size-tiny': '0.75rem',
+    '--heroui-font-size-small': '0.875rem',
+    '--heroui-font-size-medium': '1rem',
+    '--heroui-font-size-large': '1.125rem',
+    '--heroui-line-height-tiny': '1rem',
+    '--heroui-line-height-small': '1.25rem',
+    '--heroui-line-height-medium': '1.5rem',
+    '--heroui-line-height-large': '1.75rem',
+    '--heroui-radius-small': '8px',
+    '--heroui-radius-medium': '12px',
+    '--heroui-radius-large': '14px',
+    '--heroui-border-width-small': '1px',
+    '--heroui-border-width-medium': '2px',
+    '--heroui-border-width-large': '3px',
+    '--heroui-box-shadow-small':
+      '0px 0px 5px 0px rgba(0, 0, 0, .02), 0px 2px 10px 0px rgba(0, 0, 0, .06), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-box-shadow-medium':
+      '0px 0px 15px 0px rgba(0, 0, 0, .03), 0px 2px 30px 0px rgba(0, 0, 0, .08), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-box-shadow-large':
+      '0px 0px 30px 0px rgba(0, 0, 0, .04), 0px 30px 60px 0px rgba(0, 0, 0, .12), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-hover-opacity': '.8'
+  }
+}
+export default {
+  theme,
+  author: 'NapCat',
+  name: 'nc_pink',
+  description: 'NapCat Pink Theme'
+} satisfies ThemeInfo

napcat.webui/src/controllers/file_manager.ts

@@ -196,4 +196,26 @@ export default class FileManager {
     )
     return data.data
   }
+
+  public static async uploadWebUIFont(file: File) {
+    const formData = new FormData()
+    formData.append('file', file)
+    const { data } = await serverRequest.post<ServerResponse<boolean>>(
+      '/File/font/upload/webui',
+      formData,
+      {
+        headers: {
+          'Content-Type': 'multipart/form-data'
+        }
+      }
+    )
+    return data.data
+  }
+
+  public static async deleteWebUIFont() {
+    const { data } = await serverRequest.post<ServerResponse<boolean>>(
+      '/File/font/delete/webui'
+    )
+    return data.data
+  }
 }

napcat.webui/src/controllers/qq_manager.ts

@@ -73,4 +73,17 @@ export default class QQManager {
     )
     return data.data.data
   }
+
+  public static async getQuickLoginQQ() {
+    const { data } = await serverRequest.post<ServerResponse<string>>(
+      '/QQLogin/GetQuickLoginQQ'
+    )
+    return data.data
+  }
+
+  public static async setQuickLoginQQ(uin: string) {
+    await serverRequest.post<ServerResponse<null>>('/QQLogin/SetQuickLoginQQ', {
+      uin
+    })
+  }
 }

napcat.webui/src/controllers/webui_manager.ts

@@ -9,14 +9,6 @@ export interface Log {
   message: string
 }
 
-export interface TerminalSession {
-  id: string
-}
-
-export interface TerminalInfo {
-  id: string
-}
-
 export default class WebUIManager {
   public static async checkWebUiLogined() {
     const { data } =
@@ -40,6 +32,13 @@ export default class WebUIManager {
     return data.data
   }
 
+  public static async checkUsingDefaultToken() {
+    const { data } = await serverRequest.get<ServerResponse<boolean>>(
+      '/auth/check_using_default_token'
+    )
+    return data.data
+  }
+
   public static async proxy<T>(url = '') {
     const data = await serverRequest.get<ServerResponse<string>>(
       '/base/proxy?url=' + encodeURIComponent(url)
@@ -60,6 +59,20 @@ export default class WebUIManager {
     return data.data
   }
 
+  public static async getThemeConfig() {
+    const { data } =
+      await serverRequest.get<ServerResponse<ThemeConfig>>('/base/Theme')
+    return data.data
+  }
+
+  public static async setThemeConfig(theme: ThemeConfig) {
+    const { data } = await serverRequest.post<ServerResponse<boolean>>(
+      '/base/SetTheme',
+      { theme }
+    )
+    return data.data
+  }
+
   public static async getLogList() {
     const { data } =
       await serverRequest.get<ServerResponse<string[]>>('/Log/GetLogList')

napcat.webui/src/main.tsx

@@ -8,6 +8,7 @@ import '@/styles/globals.css'
 
 import key from './const/key'
 import WebUIManager from './controllers/webui_manager'
+import { loadTheme } from './utils/theme'
 
 WebUIManager.checkWebUiLogined()
 
@@ -22,6 +23,8 @@ if (theme && !theme.startsWith('"')) {
   localStorage.setItem(key.theme, JSON.stringify(theme))
 }
 
+loadTheme()
+
 ReactDOM.createRoot(document.getElementById('root')!).render(
   // <React.StrictMode>
   <BrowserRouter basename="/webui/">

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

@@ -1,20 +1,36 @@
 import { Card, CardBody } from '@heroui/card'
 import { Tab, Tabs } from '@heroui/tabs'
+import clsx from 'clsx'
 import { useMediaQuery } from 'react-responsive'
+import { useNavigate, useSearchParams } from 'react-router-dom'
 
 import ChangePasswordCard from './change_password'
+import LoginConfigCard from './login'
 import OneBotConfigCard from './onebot'
+import ThemeConfigCard from './theme'
 import WebUIConfigCard from './webui'
 
 export interface ConfigPageProps {
   children?: React.ReactNode
+  size?: 'sm' | 'md' | 'lg'
 }
 
-const ConfingPageItem: React.FC<ConfigPageProps> = ({ children }) => {
+const ConfingPageItem: React.FC<ConfigPageProps> = ({
+  children,
+  size = 'md'
+}) => {
   return (
     <Card className="bg-opacity-50 backdrop-blur-sm">
       <CardBody className="items-center py-5">
-        <div className="w-96 max-w-full flex flex-col gap-2">{children}</div>
+        <div
+          className={clsx('max-w-full flex flex-col gap-2', {
+            'w-72': size === 'sm',
+            'w-96': size === 'md',
+            'w-[32rem]': size === 'lg'
+          })}
+        >
+          {children}
+        </div>
       </CardBody>
     </Card>
   )
@@ -22,6 +38,11 @@ const ConfingPageItem: React.FC<ConfigPageProps> = ({ children }) => {
 
 export default function ConfigPage() {
   const isMediumUp = useMediaQuery({ minWidth: 768 })
+  const navigate = useNavigate()
+  const search = useSearchParams({
+    tab: 'onebot'
+  })[0]
+  const tab = search.get('tab') ?? 'onebot'
 
   return (
     <section className="w-[1000px] max-w-full md:mx-auto gap-4 py-8 px-2 md:py-10">
@@ -30,6 +51,10 @@ export default function ConfigPage() {
         fullWidth
         className="w-full"
         isVertical={isMediumUp}
+        selectedKey={tab}
+        onSelectionChange={(key) => {
+          navigate(`/config?tab=${key}`)
+        }}
         classNames={{
           tabList: 'sticky flex top-14 bg-opacity-50 backdrop-blur-sm',
           panel: 'w-full relative',
@@ -47,12 +72,22 @@ export default function ConfigPage() {
             <WebUIConfigCard />
           </ConfingPageItem>
         </Tab>
-
+        <Tab title="登录配置" key="login">
+          <ConfingPageItem>
+            <LoginConfigCard />
+          </ConfingPageItem>
+        </Tab>
         <Tab title="修改密码" key="token">
           <ConfingPageItem>
             <ChangePasswordCard />
           </ConfingPageItem>
         </Tab>
+
+        <Tab title="主题配置" key="theme">
+          <ConfingPageItem size="lg">
+            <ThemeConfigCard />
+          </ConfingPageItem>
+        </Tab>
       </Tabs>
     </section>
   )

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

@@ -0,0 +1,89 @@
+import { Input } from '@heroui/input'
+import { useRequest } from 'ahooks'
+import { useEffect } from 'react'
+import { Controller, useForm } from 'react-hook-form'
+import toast from 'react-hot-toast'
+
+import SaveButtons from '@/components/button/save_buttons'
+import PageLoading from '@/components/page_loading'
+
+import QQManager from '@/controllers/qq_manager'
+
+const LoginConfigCard = () => {
+  const {
+    data: quickLoginData,
+    loading: quickLoginLoading,
+    error: quickLoginError,
+    refreshAsync: refreshQuickLogin
+  } = useRequest(QQManager.getQuickLoginQQ)
+  const {
+    control,
+    handleSubmit: handleOnebotSubmit,
+    formState: { isSubmitting },
+    setValue: setOnebotValue
+  } = useForm<{
+    quickLoginQQ: string
+  }>({
+    defaultValues: {
+      quickLoginQQ: ''
+    }
+  })
+
+  const reset = () => {
+    setOnebotValue('quickLoginQQ', quickLoginData ?? '')
+  }
+
+  const onSubmit = handleOnebotSubmit(async (data) => {
+    try {
+      await QQManager.setQuickLoginQQ(data.quickLoginQQ)
+      toast.success('保存成功')
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`保存失败: ${msg}`)
+    }
+  })
+
+  const onRefresh = async () => {
+    try {
+      await refreshQuickLogin()
+      toast.success('刷新成功')
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`刷新失败: ${msg}`)
+    }
+  }
+
+  useEffect(() => {
+    reset()
+  }, [quickLoginData])
+
+  if (quickLoginLoading) return <PageLoading loading={true} />
+
+  return (
+    <>
+      <title>OneBot配置 - NapCat WebUI</title>
+      <div className="flex-shrink-0 w-full">快速登录QQ</div>
+      <Controller
+        control={control}
+        name="quickLoginQQ"
+        render={({ field }) => (
+          <Input
+            {...field}
+            label="快速登录QQ"
+            placeholder="请输入QQ号"
+            isDisabled={!!quickLoginError}
+            errorMessage={quickLoginError ? '获取快速登录QQ失败' : undefined}
+          />
+        )}
+      />
+      <SaveButtons
+        onSubmit={onSubmit}
+        reset={reset}
+        isSubmitting={isSubmitting || quickLoginLoading}
+        refresh={onRefresh}
+      />
+    </>
+  )
+}
+
+export default LoginConfigCard

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

@@ -30,9 +30,9 @@ const OneBotConfigCard = () => {
     setOnebotValue('parseMultMsg', config.parseMultMsg)
   }
 
-  const onSubmit = handleOnebotSubmit((data) => {
+  const onSubmit = handleOnebotSubmit(async (data) => {
     try {
-      saveConfigWithoutNetwork(data)
+      await saveConfigWithoutNetwork(data)
       toast.success('保存成功')
     } catch (error) {
       const msg = (error as Error).message

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

@@ -0,0 +1,279 @@
+import { Accordion, AccordionItem } from '@heroui/accordion'
+import { Card, CardBody, CardHeader } from '@heroui/card'
+import { useRequest } from 'ahooks'
+import clsx from 'clsx'
+import { useEffect, useRef } from 'react'
+import { Controller, useForm, useWatch } from 'react-hook-form'
+import toast from 'react-hot-toast'
+import { FaUserAstronaut } from 'react-icons/fa'
+import { FaPaintbrush } from 'react-icons/fa6'
+import { IoIosColorPalette } from 'react-icons/io'
+import { MdDarkMode, MdLightMode } from 'react-icons/md'
+
+import themes from '@/const/themes'
+
+import ColorPicker from '@/components/ColorPicker'
+import SaveButtons from '@/components/button/save_buttons'
+import PageLoading from '@/components/page_loading'
+
+import { colorKeys, generateTheme, loadTheme } from '@/utils/theme'
+
+import WebUIManager from '@/controllers/webui_manager'
+
+export type PreviewThemeCardProps = {
+  theme: ThemeInfo
+  onPreview: () => void
+}
+
+const values = [
+  '',
+  '-50',
+  '-100',
+  '-200',
+  '-300',
+  '-400',
+  '-500',
+  '-600',
+  '-700',
+  '-800',
+  '-900'
+]
+const colors = [
+  'primary',
+  'secondary',
+  'success',
+  'danger',
+  'warning',
+  'default'
+]
+
+function PreviewThemeCard({ theme, onPreview }: PreviewThemeCardProps) {
+  const style = document.createElement('style')
+  style.innerHTML = generateTheme(theme.theme, theme.name)
+  const cardRef = useRef<HTMLDivElement>(null)
+  useEffect(() => {
+    document.head.appendChild(style)
+    return () => {
+      document.head.removeChild(style)
+    }
+  }, [])
+  return (
+    <Card
+      ref={cardRef}
+      shadow="sm"
+      radius="sm"
+      isPressable
+      onPress={onPreview}
+      className={clsx('text-primary bg-primary-50', theme.name)}
+    >
+      <CardHeader className="pb-0 flex flex-col items-start gap-1">
+        <div className="px-1 rounded-md bg-primary text-primary-foreground">
+          {theme.name}
+        </div>
+        <div className="text-xs flex items-center gap-1 text-primary-300">
+          <FaUserAstronaut />
+          {theme.author ?? '未知'}
+        </div>
+        <div className="text-xs text-primary-200">{theme.description}</div>
+      </CardHeader>
+      <CardBody>
+        <div className="flex flex-col gap-1">
+          {colors.map((color) => (
+            <div className="flex gap-1 items-center flex-wrap" key={color}>
+              <div className="text-xs w-4 text-right">
+                {color[0].toUpperCase()}
+              </div>
+              {values.map((value) => (
+                <div
+                  key={value}
+                  className={clsx(
+                    'w-2 h-2 rounded-full shadow-small',
+                    `bg-${color}${value}`
+                  )}
+                ></div>
+              ))}
+            </div>
+          ))}
+        </div>
+      </CardBody>
+    </Card>
+  )
+}
+
+const ThemeConfigCard = () => {
+  const { data, loading, error, refreshAsync } = useRequest(
+    WebUIManager.getThemeConfig
+  )
+  const {
+    control,
+    handleSubmit: handleOnebotSubmit,
+    formState: { isSubmitting },
+    setValue: setOnebotValue
+  } = useForm<{
+    theme: ThemeConfig
+  }>({
+    defaultValues: {
+      theme: {
+        dark: {},
+        light: {}
+      }
+    }
+  })
+
+  // 使用 useRef 存储 style 标签引用
+  const styleTagRef = useRef<HTMLStyleElement | null>(null)
+
+  // 在组件挂载时创建 style 标签，并在卸载时清理
+  useEffect(() => {
+    const styleTag = document.createElement('style')
+    document.head.appendChild(styleTag)
+    styleTagRef.current = styleTag
+    return () => {
+      if (styleTagRef.current) {
+        document.head.removeChild(styleTagRef.current)
+      }
+    }
+  }, [])
+
+  const theme = useWatch({ control, name: 'theme' })
+
+  const reset = () => {
+    if (data) setOnebotValue('theme', data)
+  }
+
+  const onSubmit = handleOnebotSubmit(async (data) => {
+    try {
+      await WebUIManager.setThemeConfig(data.theme)
+      toast.success('保存成功')
+      loadTheme()
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`保存失败: ${msg}`)
+    }
+  })
+
+  const onRefresh = async () => {
+    try {
+      await refreshAsync()
+      toast.success('刷新成功')
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`刷新失败: ${msg}`)
+    }
+  }
+
+  useEffect(() => {
+    reset()
+  }, [data])
+
+  useEffect(() => {
+    if (theme && styleTagRef.current) {
+      const css = generateTheme(theme)
+      styleTagRef.current.innerHTML = css
+    }
+  }, [theme])
+
+  if (loading) return <PageLoading loading={true} />
+
+  if (error)
+    return (
+      <div className="py-24 text-danger-500 text-center">{error.message}</div>
+    )
+
+  return (
+    <>
+      <title>主题配置 - NapCat WebUI</title>
+
+      <SaveButtons
+        onSubmit={onSubmit}
+        reset={reset}
+        isSubmitting={isSubmitting}
+        refresh={onRefresh}
+        className="items-end w-full p-4"
+      />
+      <div className="px-4 text-sm text-default-600">实时预览，记得保存！</div>
+      <Accordion variant="splitted" defaultExpandedKeys={['select']}>
+        <AccordionItem
+          key="select"
+          aria-label="Pick Color"
+          title="选择主题"
+          subtitle="可以切换夜间/白昼模式查看对应颜色"
+          className="shadow-small"
+          startContent={<IoIosColorPalette />}
+        >
+          <div className="flex flex-wrap gap-2">
+            {themes.map((theme) => (
+              <PreviewThemeCard
+                key={theme.name}
+                theme={theme}
+                onPreview={() => {
+                  setOnebotValue('theme', theme.theme)
+                }}
+              />
+            ))}
+          </div>
+        </AccordionItem>
+
+        <AccordionItem
+          key="pick"
+          aria-label="Pick Color"
+          title="自定义配色"
+          className="shadow-small"
+          startContent={<FaPaintbrush />}
+        >
+          <div className="space-y-2">
+            {(['dark', 'light'] as const).map((mode) => (
+              <div
+                key={mode}
+                className={clsx(
+                  'p-2 rounded-md',
+                  mode === 'dark' ? 'text-white' : 'text-black',
+                  mode === 'dark'
+                    ? 'bg-content1-foreground dark:bg-content1'
+                    : 'bg-content1 dark:bg-content1-foreground'
+                )}
+              >
+                <h3 className="text-center p-2 rounded-md bg-content2 mb-2 text-default-800 flex items-center justify-center">
+                  {mode === 'dark' ? (
+                    <MdDarkMode size={24} />
+                  ) : (
+                    <MdLightMode size={24} />
+                  )}
+                  {mode === 'dark' ? '夜间模式主题' : '白昼模式主题'}
+                </h3>
+                {colorKeys.map((key) => (
+                  <div
+                    key={key}
+                    className="grid grid-cols-2 items-center mb-2 gap-2"
+                  >
+                    <label className="text-right">{key}</label>
+                    <Controller
+                      control={control}
+                      name={`theme.${mode}.${key}`}
+                      render={({ field: { value, onChange } }) => {
+                        const hslArray = value?.split(' ') ?? [0, 0, 0]
+                        const color = `hsl(${hslArray[0]}, ${hslArray[1]}, ${hslArray[2]})`
+                        return (
+                          <ColorPicker
+                            color={color}
+                            onChange={(result) => {
+                              onChange(
+                                `${result.hsl.h} ${result.hsl.s * 100}% ${result.hsl.l * 100}%`
+                              )
+                            }}
+                          />
+                        )
+                      }}
+                    />
+                  </div>
+                ))}
+              </div>
+            ))}
+          </div>
+        </AccordionItem>
+      </Accordion>
+    </>
+  )
+}
+
+export default ThemeConfigCard

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

@@ -7,11 +7,13 @@ import toast from 'react-hot-toast'
 import key from '@/const/key'
 
 import SaveButtons from '@/components/button/save_buttons'
+import FileInput from '@/components/input/file_input'
 import ImageInput from '@/components/input/image_input'
 
 import useMusic from '@/hooks/use-music'
 
 import { siteConfig } from '@/config/site'
+import FileManager from '@/controllers/file_manager'
 
 const WebUIConfigCard = () => {
   const {
@@ -59,17 +61,51 @@ const WebUIConfigCard = () => {
   return (
     <>
       <title>WebUI配置 - NapCat WebUI</title>
-      <Controller
-        control={control}
-        name="musicListID"
-        render={({ field }) => (
-          <Input
-            {...field}
-            label="网易云音乐歌单ID（网页内音乐播放器）"
-            placeholder="请输入歌单ID"
+      <div className="flex flex-col gap-2">
+        <div className="flex-shrink-0 w-full">WebUI字体</div>
+        <div className="text-sm text-default-400">
+          此项不需要手动保存，上传成功后需清空网页缓存并刷新
+          <FileInput
+            label="中文字体"
+            onChange={async (file) => {
+              try {
+                await FileManager.uploadWebUIFont(file)
+                toast.success('上传成功')
+                setTimeout(() => {
+                  window.location.reload()
+                }, 1000)
+              } catch (error) {
+                toast.error('上传失败: ' + (error as Error).message)
+              }
+            }}
+            onDelete={async () => {
+              try {
+                await FileManager.deleteWebUIFont()
+                toast.success('删除成功')
+                setTimeout(() => {
+                  window.location.reload()
+                }, 1000)
+              } catch (error) {
+                toast.error('删除失败: ' + (error as Error).message)
+              }
+            }}
           />
-        )}
-      />
+        </div>
+      </div>
+      <div className="flex flex-col gap-2">
+        <div className="flex-shrink-0 w-full">WebUI音乐播放器</div>
+        <Controller
+          control={control}
+          name="musicListID"
+          render={({ field }) => (
+            <Input
+              {...field}
+              label="网易云音乐歌单ID（网页内音乐播放器）"
+              placeholder="请输入歌单ID"
+            />
+          )}
+        />
+      </div>
       <div className="flex flex-col gap-2">
         <div className="flex-shrink-0 w-full">背景图</div>
         <Controller

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

@@ -105,7 +105,7 @@ const DashboardIndexPage: React.FC = () => {
           <SystemStatusCard setArchInfo={setArchInfo} />
         </div>
         <Networks />
-        <Card className="bg-opacity-60 shadow-sm shadow-primary-50">
+        <Card className="bg-opacity-60 shadow-sm shadow-primary-100">
           <CardBody>
             <Hitokoto />
           </CardBody>

napcat.webui/src/pages/index.tsx

@@ -1,14 +1,46 @@
 import { Spinner } from '@heroui/spinner'
 import { AnimatePresence, motion } from 'motion/react'
-import { Suspense } from 'react'
-import { Outlet, useLocation } from 'react-router-dom'
+import { Suspense, useEffect } from 'react'
+import { Outlet, useLocation, useNavigate } from 'react-router-dom'
 
+import useAuth from '@/hooks/auth'
+import useDialog from '@/hooks/use-dialog'
+
+import WebUIManager from '@/controllers/webui_manager'
 import DefaultLayout from '@/layouts/default'
 
+const CheckDefaultPassword = () => {
+  const { isAuth } = useAuth()
+  const dialog = useDialog()
+  const navigate = useNavigate()
+  const checkDefaultPassword = async () => {
+    const data = await WebUIManager.checkUsingDefaultToken()
+    if (data) {
+      dialog.confirm({
+        title: '修改默认密码',
+        content: '检测到当前密码为默认密码，请尽快修改密码。',
+        confirmText: '前往修改',
+        onConfirm: () => {
+          navigate('/config?tab=token')
+        }
+      })
+    }
+  }
+
+  useEffect(() => {
+    if (isAuth) {
+      checkDefaultPassword()
+    }
+  }, [isAuth])
+  return null
+}
+
 export default function IndexPage() {
   const location = useLocation()
+
   return (
     <DefaultLayout>
+      <CheckDefaultPassword />
       <Suspense
         fallback={
           <div className="flex justify-center px-10">

napcat.webui/src/styles/text.css

@@ -1,6 +1,6 @@
 @layer base {
   .shiny-text {
-    @apply text-pink-400 text-opacity-60;
+    @apply text-primary-400 text-opacity-60;
     background-size: 200% 100%;
     -webkit-background-clip: text;
     background-clip: text;
@@ -10,7 +10,7 @@
     background-image: linear-gradient(
       120deg,
       rgba(255, 50, 50, 0) 40%,
-      rgba(255, 76, 76, 0.8) 50%,
+      hsl(var(--heroui-primary-400) / 0.8) 50%,
       rgba(255, 50, 50, 0) 60%
     );
   }
@@ -18,11 +18,10 @@
     background-image: linear-gradient(
       120deg,
       rgba(255, 255, 255, 0) 40%,
-      rgba(206, 21, 21, 0.8) 50%,
+      hsl(var(--heroui-primary-600) / 0.8) 50%,
       rgba(255, 255, 255, 0) 60%
     );
   }
-
   @keyframes shine {
     0% {
       background-position: 100%;

napcat.webui/src/types/server.d.ts

@@ -48,3 +48,136 @@ interface SystemStatus {
   }
   arch: string
 }
+
+interface ThemeConfigItem {
+  '--heroui-background': string
+  '--heroui-foreground-50': string
+  '--heroui-foreground-100': string
+  '--heroui-foreground-200': string
+  '--heroui-foreground-300': string
+  '--heroui-foreground-400': string
+  '--heroui-foreground-500': string
+  '--heroui-foreground-600': string
+  '--heroui-foreground-700': string
+  '--heroui-foreground-800': string
+  '--heroui-foreground-900': string
+  '--heroui-foreground': string
+  '--heroui-focus': string
+  '--heroui-overlay': string
+  '--heroui-divider': string
+  '--heroui-divider-opacity': string
+  '--heroui-content1': string
+  '--heroui-content1-foreground': string
+  '--heroui-content2': string
+  '--heroui-content2-foreground': string
+  '--heroui-content3': string
+  '--heroui-content3-foreground': string
+  '--heroui-content4': string
+  '--heroui-content4-foreground': string
+  '--heroui-default-50': string
+  '--heroui-default-100': string
+  '--heroui-default-200': string
+  '--heroui-default-300': string
+  '--heroui-default-400': string
+  '--heroui-default-500': string
+  '--heroui-default-600': string
+  '--heroui-default-700': string
+  '--heroui-default-800': string
+  '--heroui-default-900': string
+  '--heroui-default-foreground': string
+  '--heroui-default': string
+  // 新增 danger
+  '--heroui-danger-50': string
+  '--heroui-danger-100': string
+  '--heroui-danger-200': string
+  '--heroui-danger-300': string
+  '--heroui-danger-400': string
+  '--heroui-danger-500': string
+  '--heroui-danger-600': string
+  '--heroui-danger-700': string
+  '--heroui-danger-800': string
+  '--heroui-danger-900': string
+  '--heroui-danger-foreground': string
+  '--heroui-danger': string
+  // 新增 primary
+  '--heroui-primary-50': string
+  '--heroui-primary-100': string
+  '--heroui-primary-200': string
+  '--heroui-primary-300': string
+  '--heroui-primary-400': string
+  '--heroui-primary-500': string
+  '--heroui-primary-600': string
+  '--heroui-primary-700': string
+  '--heroui-primary-800': string
+  '--heroui-primary-900': string
+  '--heroui-primary-foreground': string
+  '--heroui-primary': string
+  // 新增 secondary
+  '--heroui-secondary-50': string
+  '--heroui-secondary-100': string
+  '--heroui-secondary-200': string
+  '--heroui-secondary-300': string
+  '--heroui-secondary-400': string
+  '--heroui-secondary-500': string
+  '--heroui-secondary-600': string
+  '--heroui-secondary-700': string
+  '--heroui-secondary-800': string
+  '--heroui-secondary-900': string
+  '--heroui-secondary-foreground': string
+  '--heroui-secondary': string
+  // 新增 success
+  '--heroui-success-50': string
+  '--heroui-success-100': string
+  '--heroui-success-200': string
+  '--heroui-success-300': string
+  '--heroui-success-400': string
+  '--heroui-success-500': string
+  '--heroui-success-600': string
+  '--heroui-success-700': string
+  '--heroui-success-800': string
+  '--heroui-success-900': string
+  '--heroui-success-foreground': string
+  '--heroui-success': string
+  // 新增 warning
+  '--heroui-warning-50': string
+  '--heroui-warning-100': string
+  '--heroui-warning-200': string
+  '--heroui-warning-300': string
+  '--heroui-warning-400': string
+  '--heroui-warning-500': string
+  '--heroui-warning-600': string
+  '--heroui-warning-700': string
+  '--heroui-warning-800': string
+  '--heroui-warning-900': string
+  '--heroui-warning-foreground': string
+  '--heroui-warning': string
+  // 其它配置
+  '--heroui-code-background': string
+  '--heroui-strong': string
+  '--heroui-code-mdx': string
+  '--heroui-divider-weight': string
+  '--heroui-disabled-opacity': string
+  '--heroui-font-size-tiny': string
+  '--heroui-font-size-small': string
+  '--heroui-font-size-medium': string
+  '--heroui-font-size-large': string
+  '--heroui-line-height-tiny': string
+  '--heroui-line-height-small': string
+  '--heroui-line-height-medium': string
+  '--heroui-line-height-large': string
+  '--heroui-radius-small': string
+  '--heroui-radius-medium': string
+  '--heroui-radius-large': string
+  '--heroui-border-width-small': string
+  '--heroui-border-width-medium': string
+  '--heroui-border-width-large': string
+  '--heroui-box-shadow-small': string
+  '--heroui-box-shadow-medium': string
+  '--heroui-box-shadow-large': string
+  '--heroui-hover-opacity': string
+}
+
+interface ThemeConfig {
+  dark: ThemeConfigItem
+  light: ThemeConfigItem
+}

napcat.webui/src/types/theme.d.ts

@@ -0,0 +1,6 @@
+interface ThemeInfo {
+  theme: ThemeConfig
+  name: string
+  description?: string
+  author?: string
+}

napcat.webui/src/utils/music.ts

@@ -1,19 +1,21 @@
 import { PlayMode } from '@/const/enum'
 
+import WebUIManager from '@/controllers/webui_manager'
 import type {
   FinalMusic,
   Music163ListResponse,
   Music163URLResponse
 } from '@/types/music'
 
-import WebUIManager from '@/controllers/webui_manager'
 /**
  * 获取网易云音乐歌单
  * @param id 歌单id
  * @returns 歌单信息
  */
 export const get163MusicList = async (id: string) => {
-  let res = await WebUIManager.proxy<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}`
   // )
@@ -71,7 +73,7 @@ export const get163MusicListSongs = async (id: string) => {
     if (songURL) {
       finalMusic.push({
         id: song.id,
-        url: songURL,
+        url: songURL.replace(/http:\/\//, '//').replace(/https:\/\//, '//'),
         title: song.name,
         artist: song.ar.map((p) => p.name).join('/'),
         cover: song.al.picUrl

napcat.webui/src/utils/theme.ts

@@ -0,0 +1,141 @@
+import { request } from './request'
+
+const style = document.createElement('style')
+document.head.appendChild(style)
+
+export function loadTheme() {
+  request('/files/theme.css?_t=' + Date.now())
+    .then((res) => res.data)
+    .then((css) => {
+      style.innerHTML = css
+    })
+    .catch(() => {
+      console.error('Failed to load theme.css')
+    })
+}
+
+export const colorKeys = [
+  '--heroui-background',
+
+  '--heroui-foreground-50',
+  '--heroui-foreground-100',
+  '--heroui-foreground-200',
+  '--heroui-foreground-300',
+  '--heroui-foreground-400',
+  '--heroui-foreground-500',
+  '--heroui-foreground-600',
+  '--heroui-foreground-700',
+  '--heroui-foreground-800',
+  '--heroui-foreground-900',
+  '--heroui-foreground',
+
+  '--heroui-content1',
+  '--heroui-content1-foreground',
+  '--heroui-content2',
+  '--heroui-content2-foreground',
+  '--heroui-content3',
+  '--heroui-content3-foreground',
+  '--heroui-content4',
+  '--heroui-content4-foreground',
+
+  '--heroui-default-50',
+  '--heroui-default-100',
+  '--heroui-default-200',
+  '--heroui-default-300',
+  '--heroui-default-400',
+  '--heroui-default-500',
+  '--heroui-default-600',
+  '--heroui-default-700',
+  '--heroui-default-800',
+  '--heroui-default-900',
+  '--heroui-default-foreground',
+  '--heroui-default',
+
+  '--heroui-danger-50',
+  '--heroui-danger-100',
+  '--heroui-danger-200',
+  '--heroui-danger-300',
+  '--heroui-danger-400',
+  '--heroui-danger-500',
+  '--heroui-danger-600',
+  '--heroui-danger-700',
+  '--heroui-danger-800',
+  '--heroui-danger-900',
+  '--heroui-danger-foreground',
+  '--heroui-danger',
+
+  '--heroui-primary-50',
+  '--heroui-primary-100',
+  '--heroui-primary-200',
+  '--heroui-primary-300',
+  '--heroui-primary-400',
+  '--heroui-primary-500',
+  '--heroui-primary-600',
+  '--heroui-primary-700',
+  '--heroui-primary-800',
+  '--heroui-primary-900',
+  '--heroui-primary-foreground',
+  '--heroui-primary',
+
+  '--heroui-secondary-50',
+  '--heroui-secondary-100',
+  '--heroui-secondary-200',
+  '--heroui-secondary-300',
+  '--heroui-secondary-400',
+  '--heroui-secondary-500',
+  '--heroui-secondary-600',
+  '--heroui-secondary-700',
+  '--heroui-secondary-800',
+  '--heroui-secondary-900',
+  '--heroui-secondary-foreground',
+  '--heroui-secondary',
+
+  '--heroui-success-50',
+  '--heroui-success-100',
+  '--heroui-success-200',
+  '--heroui-success-300',
+  '--heroui-success-400',
+  '--heroui-success-500',
+  '--heroui-success-600',
+  '--heroui-success-700',
+  '--heroui-success-800',
+  '--heroui-success-900',
+  '--heroui-success-foreground',
+  '--heroui-success',
+
+  '--heroui-warning-50',
+  '--heroui-warning-100',
+  '--heroui-warning-200',
+  '--heroui-warning-300',
+  '--heroui-warning-400',
+  '--heroui-warning-500',
+  '--heroui-warning-600',
+  '--heroui-warning-700',
+  '--heroui-warning-800',
+  '--heroui-warning-900',
+  '--heroui-warning-foreground',
+  '--heroui-warning',
+
+  '--heroui-focus',
+  '--heroui-overlay',
+  '--heroui-divider',
+  '--heroui-code-background',
+  '--heroui-strong',
+  '--heroui-code-mdx'
+] as const
+
+export const generateTheme = (theme: ThemeConfig, validField?: string) => {
+  let css = `:root ${validField ? `.${validField}` : ''}, .light ${validField ? `.${validField}` : ''}, [data-theme="light"] ${validField ? `.${validField}` : ''} {`
+  for (const key in theme.light) {
+    const _key = key as keyof ThemeConfigItem
+    css += `${_key}: ${theme.light[_key]};`
+  }
+  css += `}`
+  css += `.dark ${validField ? `.${validField}` : ''}, [data-theme="dark"] ${validField ? `.${validField}` : ''} {`
+  for (const key in theme.dark) {
+    const _key = key as keyof ThemeConfigItem
+    css += `${_key}: ${theme.dark[_key]};`
+  }
+  css += `}`
+  return css
+}

napcat.webui/tailwind.config.js

@@ -9,6 +9,12 @@ export default {
     './src/components/**/*.{js,ts,jsx,tsx,mdx}',
     './node_modules/@heroui/theme/dist/**/*.{js,ts,jsx,tsx}'
   ],
+  safelist: [
+    {
+      pattern:
+        /bg-(primary|secondary|success|danger|warning|default)-(50|100|200|300|400|500|600|700|800|900)/
+    }
+  ],
   theme: {
     extend: {}
   },

napcat.webui/vite.config.ts

@@ -34,7 +34,8 @@ export default defineConfig(({ mode }) => {
           ws: true,
           changeOrigin: true
         },
-        '/api': backendDebugUrl
+        '/api': backendDebugUrl,
+        '/files': backendDebugUrl
       }
     },
     build: {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.5.7",
+  "version": "4.5.23",
   "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",
@@ -32,7 +32,10 @@
     "@types/express": "^5.0.0",
     "@types/multer": "^1.4.12",
     "@types/node": "^22.0.1",
+    "@types/on-finished": "^2.3.4",
     "@types/qrcode-terminal": "^0.12.2",
+    "@types/react-color": "^3.0.13",
+    "@types/type-is": "^1.6.7",
     "@types/ws": "^8.5.12",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
@@ -40,7 +43,7 @@
     "async-mutex": "^0.5.0",
     "commander": "^13.0.0",
     "cors": "^2.8.5",
-    "esbuild": "0.24.0",
+    "esbuild": "0.25.0",
     "eslint": "^9.14.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
@@ -56,13 +59,13 @@
     "vite": "^6.0.1",
     "vite-plugin-cp": "^4.0.8",
     "vite-tsconfig-paths": "^5.1.0",
-    "winston": "^3.17.0"
+    "napcat.protobuf": "^1.1.3",
+    "winston": "^3.17.0",
+    "compressing": "^1.10.1"
   },
   "dependencies": {
     "@ffmpeg.wasm/core-mt": "^0.13.2",
-    "compressing": "^1.10.1",
     "express": "^5.0.0",
-    "piscina": "^4.7.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   }

src/common/audio-worker.ts

@@ -1,9 +1,20 @@
 import { encode } from 'silk-wasm';
+import { parentPort } from 'worker_threads';
 
 export interface EncodeArgs {
     input: ArrayBufferView | ArrayBuffer
     sampleRate: number
 }
-export default async ({ input, sampleRate }: EncodeArgs) => {
+export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
+    parentPort?.on('message', async (taskData: T) => {
+        try {
+            let ret = await cb(taskData);
+            parentPort?.postMessage(ret);
+        } catch (error: unknown) {
+            parentPort?.postMessage({ error: (error as Error).message });
+        }
+    });
+}
+recvTask<EncodeArgs>(async ({ input, sampleRate }) => {
     return await encode(input, sampleRate);
-};
+});

src/common/audio.ts

@@ -1,4 +1,3 @@
-import Piscina from 'piscina';
 import fsPromise from 'fs/promises';
 import path from 'node:path';
 import { randomUUID } from 'crypto';
@@ -6,16 +5,16 @@ import { EncodeResult, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-w
 import { LogWrapper } from '@/common/log';
 import { EncodeArgs } from '@/common/audio-worker';
 import { FFmpegService } from '@/common/ffmpeg';
+import { runTask } from './worker';
+import { fileURLToPath } from 'node:url';
 
 const ALLOW_SAMPLE_RATE = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
 
-async function getWorkerPath() {
-    return new URL(/* @vite-ignore */ './audio-worker.mjs', import.meta.url).href;
+function getWorkerPath() {
+    //return new URL(/* @vite-ignore */ './audio-worker.mjs', import.meta.url).href;
+    return path.join(path.dirname(fileURLToPath(import.meta.url)), 'audio-worker.mjs');
 }
 
-const piscina = new Piscina<EncodeArgs, EncodeResult>({
-    filename: await getWorkerPath(),
-});
 
 async function guessDuration(pttPath: string, logger: LogWrapper) {
     const pttFileInfo = await fsPromise.stat(pttPath);
@@ -46,7 +45,7 @@ export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: Log
             const { input, sampleRate } = isWav(file)
                 ? await handleWavFile(file, filePath, pcmPath)
                 : { input: await FFmpegService.convert(filePath, pcmPath), sampleRate: 24000 };
-            const silk = await piscina.run({ input: input, sampleRate: sampleRate });
+            const silk = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { input: input, sampleRate: sampleRate });
             fsPromise.unlink(pcmPath).catch((e) => logger.logError('删除临时文件失败', pcmPath, e));
             await fsPromise.writeFile(pttPath, Buffer.from(silk.data));
             logger.log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);

src/common/config-base.ts

@@ -66,7 +66,7 @@ export abstract class ConfigBase<T> {
 
     private handleError(e: unknown, message: string): void {
         if (e instanceof SyntaxError) {
-            this.core.context.logger.logError(`[Core] [Config] 操作配置文件格式错误，请检查配置文件:`, e.message);
+            this.core.context.logger.logError('[Core] [Config] 操作配置文件格式错误，请检查配置文件:', e.message);
         } else {
             this.core.context.logger.logError(`[Core] [Config] ${message}:`, (e as Error).message);
         }

src/common/ffmpeg-worker.ts

@@ -5,6 +5,17 @@ import { readFileSync, statSync, writeFileSync } from 'fs';
 import type { VideoInfo } from './video';
 import { fileTypeFromFile } from 'file-type';
 import imageSize from 'image-size';
+import { parentPort } from 'worker_threads';
+export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
+    parentPort?.on('message', async (taskData: T) => {
+        try {
+            let ret = await cb(taskData);
+            parentPort?.postMessage(ret);
+        } catch (error: unknown) {
+            parentPort?.postMessage({ error: (error as Error).message });
+        }
+    });
+}
 class FFmpegService {
     public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
         const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
@@ -137,15 +148,18 @@ interface FFmpegTask {
 }
 export default async function handleFFmpegTask({ method, args }: FFmpegTask): Promise<any> {
     switch (method) {
-    case 'extractThumbnail':
-        return await FFmpegService.extractThumbnail(...args as [string, string]);
-    case 'convertFile':
-        return await FFmpegService.convertFile(...args as [string, string, string]);
-    case 'convert':
-        return await FFmpegService.convert(...args as [string, string]);
-    case 'getVideoInfo':
-        return await FFmpegService.getVideoInfo(...args as [string, string]);
-    default:
-        throw new Error(`Unknown method: ${method}`);
+        case 'extractThumbnail':
+            return await FFmpegService.extractThumbnail(...args as [string, string]);
+        case 'convertFile':
+            return await FFmpegService.convertFile(...args as [string, string, string]);
+        case 'convert':
+            return await FFmpegService.convert(...args as [string, string]);
+        case 'getVideoInfo':
+            return await FFmpegService.getVideoInfo(...args as [string, string]);
+        default:
+            throw new Error(`Unknown method: ${method}`);
     }
-}
+}
+recvTask<FFmpegTask>(async ({ method, args }: FFmpegTask) => {
+    return await handleFFmpegTask({ method, args });
+});

src/common/ffmpeg.ts

@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import Piscina from 'piscina';
 import { VideoInfo } from './video';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { runTask } from './worker';
 
 type EncodeArgs = {
     method: 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
@@ -9,42 +11,26 @@ type EncodeArgs = {
 
 type EncodeResult = any;
 
-async function getWorkerPath() {
-    return new URL(/* @vite-ignore */ './ffmpeg-worker.mjs', import.meta.url).href;
+function getWorkerPath() {
+    return path.join(path.dirname(fileURLToPath(import.meta.url)), './ffmpeg-worker.mjs');
 }
 
 export class FFmpegService {
     public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        await piscina.run({ method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
-        await piscina.destroy();
+        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
     }
 
     public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        await piscina.run({ method: 'convertFile', args: [inputFile, outputFile, format] });
-        await piscina.destroy();
+        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convertFile', args: [inputFile, outputFile, format] });
     }
 
     public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        const result = await piscina.run({ method: 'convert', args: [filePath, pcmPath] });
-        await piscina.destroy();
+        const result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convert', args: [filePath, pcmPath] });
         return result;
     }
 
     public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        const result = await piscina.run({ method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
-        await piscina.destroy();
+        const result = await await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
         return result;
     }
 }

src/common/forward-msg-builder.ts

@@ -54,7 +54,7 @@ export class ForwardMsgBuilder {
         const id = crypto.randomUUID();
         const isGroupMsg = msg.some(m => m.isGroupMsg);
         if (!source) {
-            source = isGroupMsg ? '群聊的聊天记录' : msg.map(m => m.senderName).filter((v, i, a) => a.indexOf(v) === i).slice(0, 4).join('和') + '的聊天记录';
+            source = msg.length === 0 ? '聊天记录' : (isGroupMsg ? '群聊的聊天记录' : msg.map(m => m.senderName).filter((v, i, a) => a.indexOf(v) === i).slice(0, 4).join('和') + '的聊天记录');
         }
         if (!news) {
             news = msg.length === 0 ? [{

src/common/log.ts

@@ -232,7 +232,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
             tokens.push(`群聊 [${msg.peerName}(${msg.peerUin})]`);
         }
         if (msg.senderUin !== '0') {
-            tokens.push(`[${msg.sendMemberName ?? msg.sendRemarkName ?? msg.sendNickName}(${msg.senderUin})]`);
+            tokens.push(`[${msg.sendMemberName || msg.sendRemarkName || msg.sendNickName}(${msg.senderUin})]`);
         }
     } else if (msg.chatType == ChatType.KCHATTYPEDATALINE) {
         tokens.push('移动设备');

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.5.7';
+export const napCatVersion = '4.5.23';

src/common/worker.ts

@@ -0,0 +1,29 @@
+import { Worker } from 'worker_threads';
+
+export async function runTask<T, R>(workerScript: string, taskData: T): Promise<R> {
+    let worker = new Worker(workerScript);
+    try {
+        return await new Promise<R>((resolve, reject) => {
+            worker.on('message', (result: R) => {
+                resolve(result);
+            });
+
+            worker.on('error', (error) => {
+                reject(new Error(`Worker error: ${error.message}`));
+            });
+
+            worker.on('exit', (code) => {
+                if (code !== 0) {
+                    reject(new Error(`Worker stopped with exit code ${code}`));
+                }
+            });
+            worker.postMessage(taskData);
+        });
+    } catch (error: unknown) {
+        throw new Error(`Failed to run task: ${(error as Error).message}`);
+    } finally {
+        // Ensure the worker is terminated after the promise is settled
+        worker.terminate();
+    }
+}
+

src/core/apis/file.ts

@@ -41,9 +41,10 @@ export class NTQQFileApi {
         this.context = context;
         this.core = core;
         this.rkeyManager = new RkeyManager([
-            'https://rkey.napneko.icu/rkeys'
+            'https://ss.xingzhige.com/music_card/rkey', // 国内
+            'https://rkey.napneko.icu/rkeys' // Cloudflare
         ],
-            this.context.logger
+        this.context.logger
         );
     }
 
@@ -300,18 +301,18 @@ export class NTQQFileApi {
                     element.elementType === ElementType.FILE
                 ) {
                     switch (element.elementType) {
-                        case ElementType.PIC:
+                    case ElementType.PIC:
                             element.picElement!.sourcePath = elementResults?.[elementIndex] ?? '';
-                            break;
-                        case ElementType.VIDEO:
+                        break;
+                    case ElementType.VIDEO:
                             element.videoElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
-                        case ElementType.PTT:
+                        break;
+                    case ElementType.PTT:
                             element.pttElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
-                        case ElementType.FILE:
+                        break;
+                    case ElementType.FILE:
                             element.fileElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
+                        break;
                     }
                     elementIndex++;
                 }
@@ -434,9 +435,9 @@ export class NTQQFileApi {
         };
 
         try {
-            if (this.core.apis.PacketApi.available && this.packetRkey?.[0] && this.packetRkey?.[1]) {
-                const rkey_expired_private = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
-                const rkey_expired_group = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
+            if (this.core.apis.PacketApi.available) {
+                const rkey_expired_private = !this.packetRkey || (this.packetRkey[0] && this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000);
+                const rkey_expired_group = !this.packetRkey || (this.packetRkey[0] && this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000);
                 if (rkey_expired_private || rkey_expired_group) {
                     this.packetRkey = await this.fetchRkeyWithRetry();
                 }

src/core/apis/group.ts

@@ -165,7 +165,13 @@ export class NTQQGroupApi {
 
         return this.groupMemberCache.get(groupCode);
     }
-
+    async refreshGroupMemberCachePartial(groupCode: string, uid: string) {
+        const member = await this.getGroupMemberEx(groupCode, uid, true);
+        if (member) {
+            this.groupMemberCache.get(groupCode)?.set(uid, member);
+        }
+        return member;
+    }
     async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
         const groupCodeStr = groupCode.toString();
         const memberUinOrUidStr = memberUinOrUid.toString();

src/core/apis/msg.ts

@@ -1,5 +1,5 @@
 import { ChatType, GetFileListParam, Peer, RawMessage, SendMessageElement, SendStatusType } from '@/core/types';
-import { GroupFileInfoUpdateItem, InstanceContext, NapCatCore } from '@/core';
+import { GroupFileInfoUpdateItem, InstanceContext, NapCatCore, NodeIKernelMsgService } from '@/core';
 import { GeneralCallResult } from '@/core/services/common';
 
 export class NTQQMsgApi {
@@ -12,6 +12,11 @@ export class NTQQMsgApi {
         this.context = context;
         this.core = core;
     }
+    
+    async clickInlineKeyboardButton(...params: Parameters<NodeIKernelMsgService['clickInlineKeyboardButton']>) {
+        return this.context.session.getMsgService().clickInlineKeyboardButton(...params);
+    }
+
     getMsgByClientSeqAndTime(peer: Peer, replyMsgClientSeq: string, replyMsgTime: string) {
         // https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType 可以用过特殊方式拉取
         return this.context.session.getMsgService().getMsgByClientSeqAndTime(peer, replyMsgClientSeq, replyMsgTime);

src/core/external/offset.json

@@ -175,7 +175,7 @@
         "send": "713A318",
         "recv": "713DB50"
     },
-    "6.9.63.30851-x64": {
+    "6.9.63-30851-x64": {
         "send": "46C8040",
         "recv": "46CA8AC"
     },
@@ -195,7 +195,7 @@
         "send": "713A318",
         "recv": "713DB50"
     },
-    "6.9.63.30899-x64": {
+    "6.9.63-30899-x64": {
         "send": "46C8040",
         "recv": "46CA8AC"
     },
@@ -211,7 +211,7 @@
         "send": "39C1350",
         "recv": "39C5784"
     },
-    "6.9.63.31245-x64": {
+    "6.9.63-31245-x64": {
         "send": "4720A40",
         "recv": "47232AC"
     },
@@ -239,11 +239,11 @@
         "send": "71BFD48",
         "recv": "71C3580"
     },
-    "6.9.65.31363-x64": {
+    "6.9.65-31363-x64": {
         "send": "4720E80",
         "recv": "47236EC"
     },
-    "6.9.65.31363-arm64": {
+    "6.9.65-31363-arm64": {
         "send": "422CEF8",
         "recv": "422F710"
     }

src/core/helper/config.ts

@@ -9,7 +9,7 @@ export const NapcatConfigSchema = Type.Object({
     fileLogLevel: Type.String({ default: 'debug' }),
     consoleLogLevel: Type.String({ default: 'info' }),
     packetBackend: Type.String({ default: 'auto' }),
-    packetServer: Type.String({ default: '' })
+    packetServer: Type.String({ default: '' }),
 });
 
 export type NapcatConfig = Static<typeof NapcatConfigSchema>;

src/core/listeners/NodeIKernelSessionListener.ts

@@ -11,7 +11,7 @@ export class NodeIKernelSessionListener {
 
     }
 
-    onOpentelemetryInit(args: unknown): any {
+    onOpentelemetryInit(info: { is_init: boolean, is_report: boolean }): any {
 
     }
 

src/core/packet/context/operationContext.ts

@@ -8,13 +8,15 @@ import {
     PacketMsgPttElement,
     PacketMsgVideoElement
 } from '@/core/packet/message/element';
-import { ChatType } from '@/core';
+import { ChatType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
 import { MiniAppRawData, MiniAppReqParams } from '@/core/packet/entities/miniApp';
 import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
-import { NapProtoDecodeStructType, NapProtoEncodeStructType } from '@napneko/nap-proto-core';
-import { IndexNode, MsgInfo } from '@/core/packet/transformer/proto';
+import { NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
+import { IndexNode, LongMsgResult, MsgInfo } from '@/core/packet/transformer/proto';
 import { OidbPacket } from '@/core/packet/transformer/base';
 import { ImageOcrResult } from '@/core/packet/entities/ocrResult';
+import { gunzipSync } from 'zlib';
+import { PacketMsgConverter } from '@/core/packet/message/converter';
 
 export class PacketOperationContext {
     private readonly context: PacketContext;
@@ -116,6 +118,13 @@ export class PacketOperationContext {
         return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
     }
 
+    async GetGroupImageUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
+        const req = trans.DownloadGroupImage.build(groupUin, node);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadImage.parse(resp);
+        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+    }
+
     async ImageOCR(imgUrl: string) {
         const req = trans.ImageOCR.build(imgUrl);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -151,6 +160,12 @@ export class PacketOperationContext {
         const res = trans.DownloadGroupFile.parse(resp);
         return `https://${res.download.downloadDns}/ftn_handler/${Buffer.from(res.download.downloadUrl).toString('hex')}/?fname=`;
     }
+    async GetPrivateFileUrl(self_id: string, fileUUID: string, md5: string) {
+        const req = trans.DownloadPrivateFile.build(self_id, fileUUID, md5);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadPrivateFile.parse(resp);
+        return `http://${res.body?.result?.server}:${res.body?.result?.port}${res.body?.result?.url?.slice(8)}&isthumb=0`;
+    }
 
     async GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
         const req = trans.DownloadGroupPtt.build(groupUin, node);
@@ -195,4 +210,74 @@ export class PacketOperationContext {
             return res.msgInfo;
         }
     }
+
+    async FetchForwardMsg(res_id: string): Promise<RawMessage[]> {
+        const req = trans.DownloadForwardMsg.build(this.context.napcore.basicInfo.uid, res_id);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadForwardMsg.parse(resp);
+        const inflate = gunzipSync(res.result.payload);
+        const result = new NapProtoMsg(LongMsgResult).decode(inflate);
+
+        const main = result.action.find((r) => r.actionCommand === 'MultiMsg');
+        if (!main?.actionData.msgBody) {
+            throw new Error('msgBody is empty');
+        }
+
+        const messagesPromises = main.actionData.msgBody.map(async (msg) => {
+            if (!msg?.body?.richText?.elems) {
+                throw new Error('msg.body.richText.elems is empty');
+            }
+            const rawChains = new PacketMsgConverter().packetMsgToRaw(msg?.body?.richText?.elems);
+            const elements = await Promise.all(
+                rawChains.map(async ([element, rawElem]) => {
+                    if (element.picElement && rawElem?.commonElem?.pbElem) {
+                        const extra = new NapProtoMsg(MsgInfo).decode(rawElem.commonElem.pbElem);
+                        const index = extra?.msgInfoBody[0]?.index;
+                        if (msg?.responseHead.grp !== undefined) {
+                            const groupUin = msg?.responseHead.grp?.groupUin ?? 0;
+                            element.picElement = {
+                                ...element.picElement,
+                                originImageUrl: await this.GetGroupImageUrl(groupUin, index!)
+                            };
+                        } else {
+                            element.picElement = {
+                                ...element.picElement,
+                                originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!)
+                            };
+                        }
+                        return element;
+                    }
+                    return element;
+                })
+            );
+            return {
+                chatType: ChatType.KCHATTYPEGROUP,
+                elements: elements,
+                guildId: '',
+                isOnlineMsg: false,
+                msgId: '7467703692092974645',  // TODO: no necessary
+                msgRandom: '0',
+                msgSeq: String(msg.contentHead.sequence ?? 0),
+                msgTime: String(msg.contentHead.timeStamp ?? 0),
+                msgType: NTMsgType.KMSGTYPEMIX,
+                parentMsgIdList: [],
+                parentMsgPeer: {
+                    chatType: ChatType.KCHATTYPEGROUP,
+                    peerUid: String(msg?.responseHead.grp?.groupUin ?? 0),
+                },
+                peerName: '',
+                peerUid: '1094950020',
+                peerUin: '1094950020',
+                recallTime: '0',
+                records: [],
+                sendNickName: msg?.responseHead.grp?.memberName ?? '',
+                sendRemarkName: msg?.responseHead.grp?.memberName ?? '',
+                senderUid: '',
+                senderUin: '1094950020',
+                sourceType: MsgSourceType.K_DOWN_SOURCETYPE_UNKNOWN,
+                subMsgType: 1,
+            };
+        });
+        return await Promise.all(messagesPromises);
+    }
 }

src/core/packet/highway/highwayContext.ts

@@ -144,7 +144,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadGroupImageReq get upload ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
@@ -181,7 +181,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadC2CImageReq get upload ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
@@ -219,7 +219,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadGroupVideoReq get upload video ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
                 fileUuid: index.fileUuid,
@@ -244,16 +244,16 @@ export class PacketHighwayContext {
             this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid ukey ${ukey}, don't need upload!`);
         }
         const subFile = preRespData.upload.subFileInfos[0];
-        if (subFile.uKey && subFile.uKey != '') {
-            this.logger.debug(`[Highway] uploadGroupVideoReq get upload video thumb ukey: ${subFile.uKey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[1].index;
+        if (subFile!.uKey && subFile!.uKey != '') {
+            this.logger.debug(`[Highway] uploadGroupVideoReq get upload video thumb ukey: ${subFile!.uKey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[1]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
                 fileUuid: index.fileUuid,
-                uKey: subFile.uKey,
+                uKey: subFile!.uKey,
                 network: {
-                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile.ipv4S)
+                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile!.ipv4S)
                 },
                 msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
                 blockSize: BlockSize,
@@ -269,7 +269,7 @@ export class PacketHighwayContext {
                 extend
             );
         } else {
-            this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid thumb ukey ${subFile.uKey}, don't need upload!`);
+            this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid thumb ukey ${subFile!.uKey}, don't need upload!`);
         }
         video.msgInfo = preRespData.upload.msgInfo;
     }
@@ -284,7 +284,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadC2CVideoReq get upload video ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
                 fileUuid: index.fileUuid,
@@ -309,16 +309,16 @@ export class PacketHighwayContext {
             this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid ukey ${ukey}, don't need upload!`);
         }
         const subFile = preRespData.upload.subFileInfos[0];
-        if (subFile.uKey && subFile.uKey != '') {
-            this.logger.debug(`[Highway] uploadC2CVideoReq get upload video thumb ukey: ${subFile.uKey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[1].index;
+        if (subFile!.uKey && subFile!.uKey != '') {
+            this.logger.debug(`[Highway] uploadC2CVideoReq get upload video thumb ukey: ${subFile!.uKey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[1]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
                 fileUuid: index.fileUuid,
-                uKey: subFile.uKey,
+                uKey: subFile!.uKey,
                 network: {
-                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile.ipv4S)
+                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile!.ipv4S)
                 },
                 msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
                 blockSize: BlockSize,
@@ -334,7 +334,7 @@ export class PacketHighwayContext {
                 extend
             );
         } else {
-            this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid thumb ukey ${subFile.uKey}, don't need upload!`);
+            this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid thumb ukey ${subFile!.uKey}, don't need upload!`);
         }
         video.msgInfo = preRespData.upload.msgInfo;
     }
@@ -347,7 +347,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadGroupPttReq get upload ptt ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
@@ -383,7 +383,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadC2CPttReq get upload ptt ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({

src/core/packet/message/converter.ts

@@ -1,18 +1,18 @@
 import {
-    Peer,
     ChatType,
     ElementType,
     MessageElement,
+    Peer,
     RawMessage,
     SendArkElement,
     SendFaceElement,
     SendFileElement,
     SendMarkdownElement,
     SendMarketFaceElement,
+    SendMultiForwardMsgElement,
     SendPicElement,
     SendPttElement,
     SendReplyElement,
-    SendStructLongMsgElement,
     SendTextElement,
     SendVideoElement
 } from '@/core';
@@ -31,7 +31,9 @@ import {
     PacketMsgVideoElement,
     PacketMultiMsgElement
 } from '@/core/packet/message/element';
-import { PacketMsg, PacketSendMsgElement } from '@/core/packet/message/message';
+import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
+import {NapProtoDecodeStructType} from '@napneko/nap-proto-core';
+import {Elem} from '@/core/packet/transformer/proto';
 
 const SupportedElementTypes = [
     ElementType.TEXT,
@@ -44,7 +46,7 @@ const SupportedElementTypes = [
     ElementType.PTT,
     ElementType.ARK,
     ElementType.MARKDOWN,
-    ElementType.STRUCTLONGMSG
+    ElementType.MULTIFORWARD
 ];
 
 type SendMessageTypeElementMap = {
@@ -57,7 +59,7 @@ type SendMessageTypeElementMap = {
     [ElementType.REPLY]: SendReplyElement,
     [ElementType.ARK]: SendArkElement,
     [ElementType.MFACE]: SendMarketFaceElement,
-    [ElementType.STRUCTLONGMSG]: SendStructLongMsgElement,
+    [ElementType.MULTIFORWARD]: SendMultiForwardMsgElement,
     [ElementType.MARKDOWN]: SendMarkdownElement,
 };
 
@@ -116,9 +118,8 @@ export class PacketMsgConverter {
         [ElementType.MARKDOWN]: (element) => {
             return new PacketMsgMarkDownElement(element as SendMarkdownElement);
         },
-        // TODO: check this logic, move it in arkElement?
-        [ElementType.STRUCTLONGMSG]: (element) => {
-            return new PacketMultiMsgElement(element as SendStructLongMsgElement);
+        [ElementType.MULTIFORWARD]: (element) => {
+            return new PacketMultiMsgElement(element as SendMultiForwardMsgElement);
         }
     };
 
@@ -154,4 +155,16 @@ export class PacketMsgConverter {
             }).filter((e) => e !== null)
         };
     }
+
+    packetMsgToRaw(msg: NapProtoDecodeStructType<typeof Elem>[]): [MessageElement, NapProtoDecodeStructType<typeof Elem> | null][] {
+        const converters = [PacketMsgTextElement.parseElement,
+            PacketMsgAtElement.parseElement, PacketMsgReplyElement.parseElement, PacketMsgPicElement.parseElement];
+        return msg.map((element) => {
+            for (const converter of converters) {
+                const result = converter(element);
+                if (result) return result;
+            }
+            return null;
+        }).filter((e) => e !== null);
+    }
 }

src/core/packet/message/element.ts

@@ -1,20 +1,22 @@
 import * as zlib from 'node:zlib';
-import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
+import {NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg} from '@napneko/nap-proto-core';
 import {
     CustomFace,
     Elem,
+    FileExtra,
+    GroupFileExtra,
     MarkdownData,
     MentionExtra,
+    MsgInfo,
     NotOnlineImage,
+    OidbSvcTrpcTcp0XE37_800Response,
     QBigFaceExtra,
     QSmallFaceExtra,
-    MsgInfo,
-    OidbSvcTrpcTcp0XE37_800Response,
-    FileExtra,
-    GroupFileExtra
 } from '@/core/packet/transformer/proto';
 import {
+    ElementType,
     FaceType,
+    MessageElement,
     NTMsgAtType,
     PicType,
     SendArkElement,
@@ -25,12 +27,15 @@ import {
     SendPicElement,
     SendPttElement,
     SendReplyElement,
-    SendStructLongMsgElement,
+    SendMultiForwardMsgElement,
     SendTextElement,
     SendVideoElement
 } from '@/core';
-import { ForwardMsgBuilder } from '@/common/forward-msg-builder';
-import { PacketMsg, PacketSendMsgElement } from '@/core/packet/message/message';
+import {ForwardMsgBuilder} from '@/common/forward-msg-builder';
+import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
+
+export type ParseElementFnR = [MessageElement, NapProtoDecodeStructType<typeof Elem> | null] | undefined;
+type ParseElementFn = (elem: NapProtoDecodeStructType<typeof Elem>) => ParseElementFnR;
 
 // raw <-> packet
 // TODO: SendStructLongMsgElement
@@ -51,6 +56,8 @@ export abstract class IPacketMsgElement<T extends PacketSendMsgElement> {
         return [];
     }
 
+    static parseElement: ParseElementFn;
+
     toPreview(): string {
         return '[暂不支持该消息类型喵~]';
     }
@@ -72,11 +79,30 @@ export class PacketMsgTextElement extends IPacketMsgElement<SendTextElement> {
         }];
     }
 
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem.text?.str && (elem.text?.attr6Buf === undefined || elem.text?.attr6Buf?.length === 0)) {
+            return [{
+                textElement: {
+                    content: elem.text?.str,
+                    atType: NTMsgAtType.ATTYPEUNKNOWN,
+                    atUid: '',
+                    atTinyId: '',
+                    atNtUid: '',
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, null];
+        }
+        return undefined;
+    };
+
     override toPreview(): string {
         return this.text;
-    }
+    };
 }
 
+
+
 export class PacketMsgAtElement extends PacketMsgTextElement {
     targetUid: string;
     atAll: boolean;
@@ -101,6 +127,22 @@ export class PacketMsgAtElement extends PacketMsgTextElement {
             }
         }];
     }
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem.text?.str && (elem.text?.attr6Buf?.length ?? 100) >= 11) {
+            return [{
+                textElement: {
+                    content: elem.text?.str,
+                    atType: NTMsgAtType.ATTYPEONE,
+                    atUid: String(Buffer.from(elem.text!.attr6Buf!).readUInt32BE(7)),  // FIXME: hack
+                    atTinyId: '',
+                    atNtUid: '',
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, null];
+        }
+        return undefined;
+    };
 }
 
 export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
@@ -143,6 +185,22 @@ export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
         }];
     }
 
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem.srcMsg && elem.srcMsg.pbReserve) {
+            const reserve = elem.srcMsg.pbReserve;
+            return [{
+                replyElement: {
+                    replayMsgSeq: String(reserve.friendSeq ?? elem.srcMsg?.origSeqs?.[0] ?? 0),
+                    replayMsgId: String(reserve.messageId ?? 0),
+                    senderUin: String(elem?.srcMsg ?? 0)
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, null];
+        }
+        return undefined;
+    };
+
     override toPreview(): string {
         return '[回复消息]';
     }
@@ -198,6 +256,46 @@ export class PacketMsgFaceElement extends IPacketMsgElement<SendFaceElement> {
         }
     }
 
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem.face?.index) {
+            return [{
+                faceElement: {
+                    faceIndex: elem.face.index,
+                    faceType: FaceType.Normal
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, null];
+        }
+        if (elem?.commonElem?.serviceType === 37 && elem?.commonElem?.pbElem) {
+            const qface = new NapProtoMsg(QBigFaceExtra).decode(elem?.commonElem?.pbElem);
+            if (qface?.faceId) {
+                return [{
+                    faceElement: {
+                        faceIndex: qface.faceId,
+                        faceType: FaceType.Normal
+                    },
+                    elementType: ElementType.UNKNOWN,
+                    elementId: '',
+                }, null];
+            }
+        }
+        if (elem?.commonElem?.serviceType === 33 && elem?.commonElem?.pbElem) {
+            const qface = new NapProtoMsg(QSmallFaceExtra).decode(elem?.commonElem?.pbElem);
+            if (qface?.faceId) {
+                return [{
+                    faceElement: {
+                        faceIndex: qface.faceId,
+                        faceType: FaceType.Normal
+                    },
+                    elementType: ElementType.UNKNOWN,
+                    elementId: '',
+                }, null];
+            }
+        }
+        return undefined;
+    };
+
     override toPreview(): string {
         return '[表情]';
     }
@@ -286,6 +384,60 @@ export class PacketMsgPicElement extends IPacketMsgElement<SendPicElement> {
         }];
     }
 
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem?.commonElem?.serviceType === 48 || [10, 20].includes(elem?.commonElem?.businessType ?? 0)) {
+            const extra = new NapProtoMsg(MsgInfo).decode(elem.commonElem!.pbElem!);
+            const msgInfoBody = extra.msgInfoBody[0];
+            const index = msgInfoBody?.index;
+            return [{
+                picElement: {
+                    fileSize: index?.info.fileSize ?? 0,
+                    picWidth: index?.info?.width ?? 0,
+                    picHeight: index?.info?.height ?? 0,
+                    fileName: index?.info?.fileHash ?? '',
+                    sourcePath: '',
+                    original: false,
+                    picType: PicType.NEWPIC_APNG,
+                    fileUuid: '',
+                    fileSubId: '',
+                    thumbFileSize: 0,
+                    summary: '[图片]',
+                    thumbPath: new Map(),
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, elem];
+        }
+        if (elem?.notOnlineImage) {
+            const img = elem?.notOnlineImage; // url in originImageUrl
+            const preImg: MessageElement = {
+                picElement: {
+                    fileSize: img.fileLen ?? 0,
+                    picWidth: img.picWidth ?? 0,
+                    picHeight: img.picHeight ?? 0,
+                    fileName: Buffer.from(img.picMd5!).toString('hex') ?? '',
+                    sourcePath: '',
+                    original: false,
+                    picType: PicType.NEWPIC_APNG,
+                    fileUuid: '',
+                    fileSubId: '',
+                    thumbFileSize: 0,
+                    summary: '[图片]',
+                    thumbPath: new Map(),
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            };
+            if (img.origUrl?.includes('&fileid=')) {
+                preImg.picElement!.originImageUrl = `https://multimedia.nt.qq.com.cn${img.origUrl}`;
+            } else {
+                preImg.picElement!.originImageUrl = `https://gchat.qpic.cn${img.origUrl}`;
+            }
+            return [preImg, elem];
+        }
+        return undefined;
+    };
+
     override toPreview(): string {
         return this.summary;
     }
@@ -509,13 +661,13 @@ export class PacketMsgMarkDownElement extends IPacketMsgElement<SendMarkdownElem
     }
 }
 
-export class PacketMultiMsgElement extends IPacketMsgElement<SendStructLongMsgElement> {
+export class PacketMultiMsgElement extends IPacketMsgElement<SendMultiForwardMsgElement> {
     resid: string;
     message: PacketMsg[];
 
-    constructor(rawElement: SendStructLongMsgElement, message?: PacketMsg[]) {
+    constructor(rawElement: SendMultiForwardMsgElement, message?: PacketMsg[]) {
         super(rawElement);
-        this.resid = rawElement.structLongMsgElement.resId;
+        this.resid = rawElement.multiForwardMsgElement.resId;
         this.message = message ?? [];
     }
 

src/core/packet/message/message.ts

@@ -1,7 +1,7 @@
 import { IPacketMsgElement } from '@/core/packet/message/element';
-import { SendMessageElement, SendStructLongMsgElement } from '@/core';
+import {SendMessageElement, SendMultiForwardMsgElement} from '@/core';
 
-export type PacketSendMsgElement = SendMessageElement | SendStructLongMsgElement
+export type PacketSendMsgElement = SendMessageElement | SendMultiForwardMsgElement
 
 export interface PacketMsg {
     seq?: number;

src/core/packet/transformer/highway/DownloadGroupImage.ts

@@ -0,0 +1,50 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
+import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
+import { IndexNode } from '@/core/packet/transformer/proto';
+
+class DownloadGroupImage extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
+    constructor() {
+        super();
+    }
+
+    build(group_uin: number, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
+        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
+            reqHead: {
+                common: {
+                    requestId: 1,
+                    command: 200
+                },
+                scene: {
+                    requestType: 2,
+                    businessType: 1,
+                    sceneType: 2,
+                    group: {
+                        groupUin: group_uin
+                    }
+                },
+                client: {
+                    agentType: 2,
+                }
+            },
+            download: {
+                node: node,
+                download: {
+                    video: {
+                        busiType: 0,
+                        sceneType: 0
+                    }
+                }
+            }
+        });
+        return OidbBase.build(0x11C4, 200, body, true, false);
+    }
+
+    parse(data: Buffer) {
+        const oidbBody = OidbBase.parse(data).body;
+        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
+    }
+}
+
+export default new DownloadGroupImage();

src/core/packet/transformer/highway/DownloadImage.ts

@@ -14,7 +14,7 @@ class DownloadImage extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
             reqHead: {
                 common: {
                     requestId: 1,
-                    command: 100
+                    command: 200
                 },
                 scene: {
                     requestType: 2,

src/core/packet/transformer/highway/index.ts

@@ -12,3 +12,4 @@ export { default as UploadPrivateImage } from './UploadPrivateImage';
 export { default as UploadPrivatePtt } from './UploadPrivatePtt';
 export { default as UploadPrivateVideo } from './UploadPrivateVideo';
 export { default as DownloadImage } from './DownloadImage';
+export { default as DownloadGroupImage } from './DownloadGroupImage';

src/core/packet/transformer/message/DownloadForwardMsg.ts

@@ -0,0 +1,37 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
+
+class DownloadForwardMsg extends PacketTransformer<typeof proto.RecvLongMsgResp> {
+    constructor() {
+        super();
+    }
+
+    build(uid: string, resId: string): OidbPacket {
+        const req = new NapProtoMsg(proto.RecvLongMsgReq).encode({
+            info: {
+                uid: {
+                    uid: uid
+                },
+                resId: resId,
+                acquire: true
+            },
+            settings: {
+                field1: 2,
+                field2: 0,
+                field3: 0,
+                field4: 0
+            }
+        });
+        return {
+            cmd: 'trpc.group.long_msg_interface.MsgService.SsoRecvLongMsg',
+            data: PacketHexStrBuilder(req)
+        };
+    }
+
+    parse(data: Buffer) {
+        return new NapProtoMsg(proto.RecvLongMsgResp).decode(data);
+    }
+}
+
+export default new DownloadForwardMsg();

src/core/packet/transformer/message/UploadForwardMsg.ts

@@ -13,12 +13,12 @@ class UploadForwardMsg extends PacketTransformer<typeof proto.SendLongMsgResp> {
         const msgBody = this.msgBuilder.buildFakeMsg(selfUid, msg);
         const longMsgResultData = new NapProtoMsg(proto.LongMsgResult).encode(
             {
-                action: {
+                action: [{
                     actionCommand: 'MultiMsg',
                     actionData: {
                         msgBody: msgBody
                     }
-                }
+                }]
             }
         );
         const payload = zlib.gzipSync(Buffer.from(longMsgResultData));

src/core/packet/transformer/message/index.ts

@@ -1 +1,2 @@
 export { default as UploadForwardMsg } from './UploadForwardMsg';
+export { default as DownloadForwardMsg } from './DownloadForwardMsg';

src/core/packet/transformer/proto/message/action.ts

@@ -2,7 +2,7 @@ import { ProtoField, ScalarType } from '@napneko/nap-proto-core';
 import { PushMsgBody } from '@/core/packet/transformer/proto';
 
 export const LongMsgResult = {
-    action: ProtoField(2, () => LongMsgAction)
+    action: ProtoField(2, () => LongMsgAction, false, true)
 };
 
 export const LongMsgAction = {

src/core/services/NodeIKernelBaseEmojiService.ts

@@ -1,4 +1,5 @@
 import { DownloadBaseEmojiByIdReq, DownloadBaseEmojiByUrlReq, GetBaseEmojiPathReq, PullSysEmojisReq } from '../types';
+import { GeneralCallResult } from './common';
 
 export interface NodeIKernelBaseEmojiService {
     removeKernelBaseEmojiListener(listenerId: number): void;
@@ -7,7 +8,26 @@ export interface NodeIKernelBaseEmojiService {
 
     isBaseEmojiPathExist(args: Array<string>): unknown;
 
-    fetchFullSysEmojis(pullSysEmojisReq: PullSysEmojisReq): unknown;
+    fetchFullSysEmojis(pullSysEmojisReq: PullSysEmojisReq): Promise<GeneralCallResult & {
+        rsp: {
+            otherPanelResult: {
+                SysEmojiGroupList: Array<unknown>,
+                downloadInfo: Array<unknown>
+            },
+            normalPanelResult: {
+                SysEmojiGroupList: Array<unknown>,
+                downloadInfo: Array<unknown>
+            },
+            superPanelResult: {
+                SysEmojiGroupList: Array<unknown>,
+                downloadInfo: Array<unknown>
+            },
+            redHeartPanelResult: {
+                SysEmojiGroupList: Array<unknown>,
+                downloadInfo: Array<unknown>
+            }
+        }
+    }>;
 
     getBaseEmojiPathByIds(getBaseEmojiPathReqs: Array<GetBaseEmojiPathReq>): unknown;
 

src/core/services/NodeIKernelGroupService.ts

@@ -253,7 +253,7 @@ export interface NodeIKernelGroupService {
 
     getGroupShutUpMemberList(groupCode: string): Promise<GeneralCallResult>;
 
-    setMemberShutUp(groupCode: string, memberTimes: { uid: string, timeStamp: number }[]): Promise<void>;
+    setMemberShutUp(groupCode: string, memberTimes: { uid: string, timeStamp: number }[]): Promise<GeneralCallResult>;
 
     getGroupRecommendContactArkJson(groupCode: string): Promise<GeneralCallResult & { arkJson: string }>;
 

src/core/services/NodeIKernelMSFService.ts

@@ -1,5 +1,9 @@
 import { GeneralCallResult } from './common';
-
+enum ProxyType {
+    CLOSE = 0,
+    HTTP = 1,
+    SOCKET = 2
+}
 export interface NodeIKernelMSFService {
     getServerTime(): string;
     setNetworkProxy(param: {
@@ -7,10 +11,19 @@ export interface NodeIKernelMSFService {
         userPwd: string,
         address: string,
         port: number,
-        proxyType: number,
+        proxyType: ProxyType,
         domain: string,
         isSocket: boolean
     }): Promise<GeneralCallResult>;
+    getNetworkProxy(): Promise<{
+        userName: string,
+        userPwd: string,
+        address: string,
+        port: number,
+        proxyType: ProxyType,
+        domain: string,
+        isSocket: boolean
+    }>;
     //http
     //     userName: '',
     //     userPwd: '',

src/core/services/NodeIKernelMsgService.ts

@@ -464,11 +464,20 @@ export interface NodeIKernelMsgService {
 
     setMsgEmojiLikesForRole(...args: unknown[]): unknown;
 
-    clickInlineKeyboardButton(...args: unknown[]): unknown;
+    clickInlineKeyboardButton(params: {
+        guildId?: string,
+        peerId: string,
+        botAppid: string,
+        msgSeq: string,
+        buttonId: string,
+        callback_data: string,
+        dmFlag: number,
+        chatType: number // 1私聊 2群
+    }): Promise<GeneralCallResult & { status: number, promptText: string, promptType: number, promptIcon: number }>;
 
     setCurOnScreenMsg(...args: unknown[]): unknown;
 
-    setCurOnScreenMsgForMsgEvent(...args: unknown[]): unknown;
+    setCurOnScreenMsgForMsgEvent(peer: Peer, msgRegList: Map<string, Uint8Array>): void;
 
     getMiscData(key: string): unknown;
 

src/core/services/NodeIKernelRobotService.ts

@@ -1,4 +1,5 @@
 import { NodeIKernelRobotListener } from '@/core/listeners';
+import { GeneralCallResult, Peer } from '..';
 
 export interface NodeIKernelRobotService {
     fetchGroupRobotStoreDiscovery(arg: unknown): unknown;
@@ -31,5 +32,17 @@ export interface NodeIKernelRobotService {
 
     getRobotUinRange(data: unknown): Promise<{ response: { robotUinRanges: Array<unknown> } }>;
 
+    getRobotFunctions(peer: Peer, params: {
+        uins: Array<string>,
+        num: 0,
+        client_info: { platform: 4, version: '', build_num: 9999 },
+        tinyids: [],
+        page: 0,
+        full_fetch: false,
+        scene: 4,
+        filter: 1,
+        bkn: ''
+    }): Promise<GeneralCallResult & { response: { bot_features: Array<unknown>, next_page: number } }>;
+
     isNull(): boolean;
 }

src/core/types/element.ts

@@ -347,6 +347,8 @@ export type SendMarkdownElement = SendElementBase<ElementType.MARKDOWN> & Elemen
 
 export type SendShareLocationElement = SendElementBase<ElementType.SHARELOCATION> & ElementBase<'shareLocationElement'>;
 
+export type SendMultiForwardMsgElement = SendElementBase<ElementType.MULTIFORWARD> & ElementBase<'multiForwardMsgElement'>;
+
 export type SendMessageElement = SendTextElement | SendPttElement |
     SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement |
     SendVideoElement | SendArkElement | SendMarkdownElement | SendShareLocationElement;

src/onebot/action/extends/BotExit.ts

@@ -0,0 +1,10 @@
+import { ActionName } from '@/onebot/action/router';
+import { OneBotAction } from '../OneBotAction';
+
+export class BotExit extends OneBotAction<void, void> {
+    override actionName = ActionName.Exit;
+
+    async _handle() {
+        process.exit(0);
+    }
+}

src/onebot/action/extends/ClickInlineKeyboardButton.ts

@@ -0,0 +1,30 @@
+import { ActionName } from '@/onebot/action/router';
+import { OneBotAction } from '../OneBotAction';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    group_id: Type.Union([Type.Number(), Type.String()]),
+    bot_appid: Type.String(),
+    button_id: Type.String({ default: '' }),
+    callback_data: Type.String({ default: '' }),
+    msg_seq: Type.String({ default: '10086' }),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class ClickInlineKeyboardButton extends OneBotAction<Payload, unknown> {
+    override actionName = ActionName.ClickInlineKeyboardButton;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        return await this.core.apis.MsgApi.clickInlineKeyboardButton({
+            buttonId: payload.button_id,
+            peerId: payload.group_id.toString(),
+            botAppid: payload.bot_appid,
+            msgSeq: payload.msg_seq,
+            callback_data: payload.callback_data,
+            dmFlag: 0,
+            chatType: 2
+        })
+    }
+}

src/onebot/action/extends/GetUnidirectionalFriendList.ts

@@ -0,0 +1,56 @@
+import { PacketHexStr } from '@/core/packet/transformer/base';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { ProtoBuf, ProtoBufBase, PBUint32, PBString } from 'napcat.protobuf';
+
+interface Friend {
+    uin: number;
+    uid: string;
+    nick_name: string;
+    age: number;
+    source: string;
+}
+
+interface Block {
+    str_uid: string;
+    bytes_source: string;
+    uint32_sex: number;
+    uint32_age: number;
+    bytes_nick: string;
+    uint64_uin: number;
+}
+
+export class GetUnidirectionalFriendList extends OneBotAction<void, Friend[]> {
+    override actionName = ActionName.GetUnidirectionalFriendList;
+
+    async pack_data(data: string): Promise<Uint8Array> {
+        return ProtoBuf(class extends ProtoBufBase {
+            type = PBUint32(2, false, 0);
+            data = PBString(3, false, data);
+        }).encode();
+    }
+
+    async _handle(): Promise<Friend[]> {
+        const self_id = this.core.selfInfo.uin;
+        const req_json = {
+            uint64_uin: self_id,
+            uint64_top: 0,
+            uint32_req_num: 99,
+            bytes_cookies: ""
+        };
+        const packed_data = await this.pack_data(JSON.stringify(req_json));
+        const data = Buffer.from(packed_data).toString('hex');
+        const rsq = { cmd: 'MQUpdateSvc_com_qq_ti.web.OidbSvc.0xe17_0', data: data as PacketHexStr };
+        const rsp_data = await this.core.apis.PacketApi.pkt.operation.sendPacket(rsq, true);
+        const block_json = ProtoBuf(class extends ProtoBufBase { data = PBString(4); }).decode(rsp_data);
+        const block_list: Block[] = JSON.parse(block_json.data).rpt_block_list;
+
+        return block_list.map((block) => ({
+            uin: block.uint64_uin,
+            uid: block.str_uid,
+            nick_name: Buffer.from(block.bytes_nick, 'base64').toString(),
+            age: block.uint32_age,
+            source: Buffer.from(block.bytes_source, 'base64').toString()
+        }));
+    }
+}

src/onebot/action/file/GetPrivateFileUrl.ts

@@ -0,0 +1,36 @@
+import { ActionName } from '@/onebot/action/router';
+import { FileNapCatOneBotUUID } from '@/common/file-uuid';
+import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    file_id: Type.String(),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+interface GetPrivateFileUrlResponse {
+    url?: string;
+}
+
+export class GetPrivateFileUrl extends GetPacketStatusDepends<Payload, GetPrivateFileUrlResponse> {
+    override actionName = ActionName.NapCat_GetPrivateFileUrl;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file_id);
+
+        if (contextMsgFile?.fileUUID && contextMsgFile.msgId) {
+            let msg = await this.core.apis.MsgApi.getMsgsByMsgId(contextMsgFile.peer, [contextMsgFile.msgId]);
+            let self_id = this.core.selfInfo.uid;
+            let file_hash = msg.msgList[0]?.elements.map(ele => ele.fileElement?.file10MMd5)[0];
+            if (file_hash) {
+                return {
+                    url: await this.core.apis.PacketApi.pkt.operation.GetPrivateFileUrl(self_id, contextMsgFile.fileUUID, file_hash)
+                };
+            }
+
+        }
+        throw new Error('real fileUUID not found!');
+    }
+}

src/onebot/action/go-cqhttp/GetForwardMsg.ts

@@ -3,6 +3,7 @@ import { OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageForward,
 import { ActionName } from '@/onebot/action/router';
 import { MessageUnique } from '@/common/message-unique';
 import { Static, Type } from '@sinclair/typebox';
+import { ChatType, ElementType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
 
 const SchemaData = Type.Object({
     message_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
@@ -57,24 +58,72 @@ export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
             throw new Error('message_id is required');
         }
 
+        const fakeForwardMsg = (res_id: string) => {
+            return {
+                chatType: ChatType.KCHATTYPEGROUP,
+                elements: [{
+                    elementType: ElementType.MULTIFORWARD,
+                    elementId: '',
+                    multiForwardMsgElement: {
+                        resId: res_id,
+                        fileName: '',
+                        xmlContent: '',
+                    }
+                }],
+                guildId: '',
+                isOnlineMsg: false,
+                msgId: '',  // TODO: no necessary
+                msgRandom: '0',
+                msgSeq: '',
+                msgTime: '',
+                msgType: NTMsgType.KMSGTYPEMIX,
+                parentMsgIdList: [],
+                parentMsgPeer: {
+                    chatType: ChatType.KCHATTYPEGROUP,
+                    peerUid: '',
+                },
+                peerName: '',
+                peerUid: '284840486',
+                peerUin: '284840486',
+                recallTime: '0',
+                records: [],
+                sendNickName: '',
+                sendRemarkName: '',
+                senderUid: '',
+                senderUin: '1094950020',
+                sourceType: MsgSourceType.K_DOWN_SOURCETYPE_UNKNOWN,
+                subMsgType: 1,
+            } as RawMessage;
+        };
+
+        const protocolFallbackLogic = async (res_id: string) => {
+            const ob = (await this.obContext.apis.MsgApi.parseMessageV2(fakeForwardMsg(res_id)))?.arrayMsg;
+            if (ob) {
+                return {
+                    messages: (ob?.message?.[0] as OB11MessageForward)?.data?.content
+                };
+            }
+            throw new Error('protocolFallbackLogic: 找不到相关的聊天记录');
+        };
+
         const rootMsgId = MessageUnique.getShortIdByMsgId(msgId.toString());
         const rootMsg = MessageUnique.getMsgIdAndPeerByShortId(rootMsgId ?? +msgId);
         if (!rootMsg) {
-            throw new Error('msg not found');
+            return await protocolFallbackLogic(msgId.toString());
         }
         const data = await this.core.apis.MsgApi.getMsgsByMsgId(rootMsg.Peer, [rootMsg.MsgId]);
 
         if (!data || data.result !== 0) {
-            throw new Error('找不到相关的聊天记录' + data?.errMsg);
+            return await protocolFallbackLogic(msgId.toString());
         }
 
         const singleMsg = data.msgList[0];
         if (!singleMsg) {
-            throw new Error('找不到相关的聊天记录');
+            return await protocolFallbackLogic(msgId.toString());
         }
         const resMsg = (await this.obContext.apis.MsgApi.parseMessageV2(singleMsg))?.arrayMsg;//强制array 以便处理
         if (!(resMsg?.message?.[0] as OB11MessageForward)?.data?.content) {
-            throw new Error('找不到相关的聊天记录');
+            return await protocolFallbackLogic(msgId.toString());
         }
         return {
             messages: (resMsg?.message?.[0] as OB11MessageForward)?.data?.content

src/onebot/action/group/SetGroupBan.ts

@@ -13,12 +13,13 @@ type Payload = Static<typeof SchemaData>;
 export default class SetGroupBan extends OneBotAction<Payload, null> {
     override actionName = ActionName.SetGroupBan;
     override payloadSchema = SchemaData;
-
     async _handle(payload: Payload): Promise<null> {
         const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
         if (!uid) throw new Error('uid error');
-        await this.core.apis.GroupApi.banMember(payload.group_id.toString(),
+        // 例如无管理员权限时 result为 120101005 errMsg为 'ERR_NOT_GROUP_ADMIN'
+        let ret = await this.core.apis.GroupApi.banMember(payload.group_id.toString(),
             [{ uid: uid, timeStamp: +payload.duration }]);
+        if (ret.result !== 0) throw new Error(ret.errMsg);
         return null;
     }
 }

src/onebot/action/index.ts

@@ -104,6 +104,10 @@ import { GetClientkey } from './extends/GetClientkey';
 import { SendPacket } from './extends/SendPacket';
 import { SendPoke } from '@/onebot/action/packet/SendPoke';
 import { SetDiyOnlineStatus } from './extends/SetDiyOnlineStatus';
+import { BotExit } from './extends/BotExit';
+import { ClickInlineKeyboardButton } from './extends/ClickInlineKeyboardButton';
+import { GetPrivateFileUrl } from './file/GetPrivateFileUrl';
+import { GetUnidirectionalFriendList } from './extends/GetUnidirectionalFriendList';
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
@@ -221,6 +225,10 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new SendPacket(obContext, core),
         new SendPoke(obContext, core),
         new GetGroupSystemMsg(obContext, core),
+        new BotExit(obContext, core),
+        new ClickInlineKeyboardButton(obContext, core),
+        new GetPrivateFileUrl(obContext,core),
+        new GetUnidirectionalFriendList(obContext,core),
     ];
 
     type HandlerUnion = typeof actionHandlers[number];

src/onebot/action/router.ts

@@ -10,6 +10,9 @@ export interface InvalidCheckResult {
 }
 
 export const ActionName = {
+    NapCat_GetPrivateFileUrl: 'get_private_file_url',
+    ClickInlineKeyboardButton: 'click_inline_keyboard_button',
+    GetUnidirectionalFriendList: 'get_unidirectional_friend_list',
     // onebot 11
     SendPrivateMsg: 'send_private_msg',
     SendGroupMsg: 'send_group_msg',
@@ -49,7 +52,7 @@ export const ActionName = {
     GetVersionInfo: 'get_version_info',
     // Reboot : 'set_restart',
     // CleanCache : 'clean_cache',
-
+    Exit: 'bot_exit',
     // go-cqhttp
     SetQQProfile: 'set_qq_profile',
     // QidianGetAccountInfo : 'qidian_get_account_info',
@@ -141,6 +144,6 @@ export const ActionName = {
     SendGroupAiRecord: 'send_group_ai_record',
 
     GetClientkey: 'get_clientkey',
-    
+
     SendPoke: 'send_poke',
 } as const;

src/onebot/api/group.ts

@@ -49,6 +49,7 @@ export class OneBotGroupApi {
                 duration = -1;
             }
         }
+        await this.core.apis.GroupApi.refreshGroupMemberCachePartial(GroupCode, memberUid);
         const adminUin = (await this.core.apis.GroupApi.getGroupMember(GroupCode, adminUid))?.uin;
         if (memberUin && adminUin) {
             return new OB11GroupBanEvent(
@@ -113,12 +114,16 @@ export class OneBotGroupApi {
     async parseCardChangedEvent(msg: RawMessage) {
         if (msg.senderUin && msg.senderUin !== '0') {
             const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin);
+            await this.core.apis.GroupApi.refreshGroupMemberCachePartial(msg.peerUid, msg.senderUid);
             if (member && member.cardName !== msg.sendMemberName) {
                 const newCardName = msg.sendMemberName ?? '';
                 const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
                 member.cardName = newCardName;
                 return event;
             }
+            if (member && member.nick !== msg.sendNickName) {
+                await this.core.apis.GroupApi.refreshGroupMemberCachePartial(msg.peerUid, msg.senderUid);
+            }
         }
         return undefined;
     }

src/onebot/api/msg.ts

@@ -1,25 +1,34 @@
 import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { MessageUnique } from '@/common/message-unique';
 import {
-    NTMsgAtType,
     ChatType,
     CustomMusicSignPostData,
     ElementType,
     FaceIndex,
+    FaceType,
+    GrayTipElement,
+    GroupNotify,
     IdMusicSignPostData,
     MessageElement,
     NapCatCore,
     NTGrayTipElementSubTypeV2,
+    NTMsgAtType,
     Peer,
     RawMessage,
     SendMessageElement,
     SendTextElement,
-    FaceType,
-    GrayTipElement,
-    GroupNotify,
 } from '@/core';
 import faceConfig from '@/core/external/face_config.json';
-import { NapCatOneBot11Adapter, OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageFileBase, OB11MessageForward, OB11MessageImage, OB11MessageVideo, } from '@/onebot';
+import {
+    NapCatOneBot11Adapter,
+    OB11Message,
+    OB11MessageData,
+    OB11MessageDataType,
+    OB11MessageFileBase,
+    OB11MessageForward,
+    OB11MessageImage,
+    OB11MessageVideo,
+} from '@/onebot';
 import { OB11Construct } from '@/onebot/helper/data';
 import { EventType } from '@/onebot/event/OneBotEvent';
 import { encodeCQCode } from '@/onebot/helper/cqcode';
@@ -30,7 +39,7 @@ import { OB11FriendAddNoticeEvent } from '@/onebot/event/notice/OB11FriendAddNot
 import { ForwardMsgBuilder } from '@/common/forward-msg-builder';
 import { NapProtoMsg } from '@napneko/nap-proto-core';
 import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent';
-import { OB11GroupDecreaseEvent, GroupDecreaseSubType } from '../event/notice/OB11GroupDecreaseEvent';
+import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from '../event/notice/OB11GroupDecreaseEvent';
 import { GroupAdmin } from '@/core/packet/transformer/proto/message/groupAdmin';
 import { OB11GroupAdminNoticeEvent } from '../event/notice/OB11GroupAdminNoticeEvent';
 import { GroupChange, GroupChangeInfo, GroupInvite, PushMsgBody } from '@/core/packet/transformer/proto';
@@ -123,7 +132,6 @@ export class OneBotMsgApi {
                         file: element.fileName,
                         sub_type: element.picSubType,
                         url: await this.core.apis.FileApi.getImageUrl(element),
-                        path: element.filePath,
                         file_size: element.fileSize,
                     },
                 };
@@ -139,13 +147,13 @@ export class OneBotMsgApi {
                 peerUid: msg.peerUid,
                 guildId: '',
             };
-            const file = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileName);
+            FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileUuid);
+            FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileName);
             return {
                 type: OB11MessageDataType.file,
                 data: {
-                    file: file,
-                    path: element.filePath,
-                    file_id: file,
+                    file: element.fileName,
+                    file_id: element.fileUuid,
                     file_size: element.fileSize,
                 },
             };
@@ -207,7 +215,6 @@ export class OneBotMsgApi {
                 data: {
                     summary: _.faceName, // 商城表情名称
                     file: filename,
-                    path: url,
                     url: url,
                     key: _.key,
                     emoji_id: _.emojiId,
@@ -264,7 +271,6 @@ export class OneBotMsgApi {
             }
 
 
-
             // 丢弃该消息段
             if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
                 this.core.context.logger.logError(
@@ -331,7 +337,6 @@ export class OneBotMsgApi {
                 type: OB11MessageDataType.video,
                 data: {
                     file: fileCode,
-                    path: videoDownUrl,
                     url: videoDownUrl,
                     file_size: element.fileSize,
                 },
@@ -349,21 +354,27 @@ export class OneBotMsgApi {
                 type: OB11MessageDataType.voice,
                 data: {
                     file: fileCode,
-                    path: element.filePath,
                     file_size: element.fileSize,
                 },
             };
         },
 
-        multiForwardMsgElement: async (_, msg, _wrapper, context) => {
+        multiForwardMsgElement: async (element, msg, _wrapper, context) => {
             const parentMsgPeer = msg.parentMsgPeer ?? {
                 chatType: msg.chatType,
                 guildId: '',
                 peerUid: msg.peerUid,
             };
-            const multiMsgs = await this.getMultiMessages(msg, parentMsgPeer);
+            let multiMsgs = await this.getMultiMessages(msg, parentMsgPeer);
             // 拉取失败则跳过
-            if (!multiMsgs) return null;
+            if (!multiMsgs || multiMsgs.length === 0) {
+                try {
+                    multiMsgs = await this.core.apis.PacketApi.pkt.operation.FetchForwardMsg(element.resId);
+                } catch (e) {
+                    this.core.context.logger.logError('Protocol FetchForwardMsg fallback failed!', e);
+                    return null;
+                }
+            }
             const forward: OB11MessageForward = {
                 type: OB11MessageDataType.forward,
                 data: { id: msg.msgId }
@@ -643,6 +654,19 @@ export class OneBotMsgApi {
         [OB11MessageDataType.node]: async () => undefined,
 
         [OB11MessageDataType.forward]: async ({ data }, context) => {
+            // let id = data.id.toString();
+            // let peer: Peer | undefined = context.peer;
+            // if (isNumeric(id)) {
+            //     let msgid = '';
+            //     if (BigInt(data.id) > 2147483647n) {
+            //         peer = MessageUnique.getPeerByMsgId(id)?.Peer;
+            //         msgid = id;
+            //     } else {
+            //         let data = MessageUnique.getMsgIdAndPeerByShortId(parseInt(id));
+            //         msgid = data?.MsgId ?? '';
+            //         peer = data?.Peer;
+            //     }
+            // }
             const jsonData = ForwardMsgBuilder.fromResId(data.id);
             return this.ob11ToRawConverters.json({
                 data: { data: JSON.stringify(jsonData) },
@@ -692,7 +716,10 @@ export class OneBotMsgApi {
         if (grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
             if (grayTipElement.jsonGrayTipElement.busiId == 1061) {
                 const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(grayTipElement, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
-                if (PokeEvent) { return PokeEvent; };
+                if (PokeEvent) {
+                    return PokeEvent;
+                }
+                ;
             } else if (grayTipElement.jsonGrayTipElement.busiId == 19324 && msg.peerUid !== '') {
                 return new OB11FriendAddNoticeEvent(this.core, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
             }
@@ -919,16 +946,16 @@ export class OneBotMsgApi {
         const calculateTotalSize = async (elements: SendMessageElement[]): Promise<number> => {
             const sizePromises = elements.map(async element => {
                 switch (element.elementType) {
-                case ElementType.PTT:
-                    return (await fsPromise.stat(element.pttElement.filePath)).size;
-                case ElementType.FILE:
-                    return (await fsPromise.stat(element.fileElement.filePath)).size;
-                case ElementType.VIDEO:
-                    return (await fsPromise.stat(element.videoElement.filePath)).size;
-                case ElementType.PIC:
-                    return (await fsPromise.stat(element.picElement.sourcePath)).size;
-                default:
-                    return 0;
+                    case ElementType.PTT:
+                        return (await fsPromise.stat(element.pttElement.filePath)).size;
+                    case ElementType.FILE:
+                        return (await fsPromise.stat(element.fileElement.filePath)).size;
+                    case ElementType.VIDEO:
+                        return (await fsPromise.stat(element.videoElement.filePath)).size;
+                    case ElementType.PIC:
+                        return (await fsPromise.stat(element.picElement.sourcePath)).size;
+                    default:
+                        return 0;
                 }
             });
             const sizes = await Promise.all(sizePromises);
@@ -978,26 +1005,20 @@ export class OneBotMsgApi {
             this.core.context.logger.logError('文件消息缺少参数', inputdata);
             throw new Error('文件消息缺少参数');
         }
-
-        const downloadFile = async (uri: string) => {
-            const { path, fileName, errMsg, success } = await uriToLocalFile(this.core.NapCatTempPath, uri);
-            if (!success) {
-                this.core.context.logger.logError('文件下载失败', errMsg);
-                throw new Error('文件下载失败: ' + errMsg);
-            }
-            return { path, fileName };
-        };
+        realUri = await this.handleObfuckName(realUri) ?? realUri;
         try {
-            const { path, fileName } = await downloadFile(realUri);
-            deleteAfterSentFiles.push(path);
-            return { path, fileName: inputdata.name ?? fileName };
-        } catch {
-            realUri = await this.handleObfuckName(realUri);
-            const { path, fileName } = await downloadFile(realUri);
+            const { path, fileName, errMsg, success } = await uriToLocalFile(this.core.NapCatTempPath, realUri);
+            if (!success) {
+                this.core.context.logger.logError('文件处理失败', errMsg);
+                throw new Error('文件处理失败: ' + errMsg);
+            }
             deleteAfterSentFiles.push(path);
             return { path, fileName: inputdata.name ?? fileName };
+        } catch (e: unknown) {
+            throw new Error((e as Error).message);
         }
     }
+
     async handleObfuckName(name: string) {
         const contextMsgFile = FileNapCatOneBotUUID.decode(name);
         if (contextMsgFile && contextMsgFile.msgId && contextMsgFile.elementId) {
@@ -1019,18 +1040,19 @@ export class OneBotMsgApi {
             }
             return url !== '' ? url : await this.core.apis.FileApi.downloadMedia(msgId, peer.chatType, peer.peerUid, elementId, '', '');
         }
-        throw new Error('文件名解析失败');
+        return undefined;
     }
+
     groupChangDecreseType2String(type: number): GroupDecreaseSubType {
         switch (type) {
-        case 130:
-            return 'leave';
-        case 131:
-            return 'kick';
-        case 3:
-            return 'kick_me';
-        default:
-            return 'kick';
+            case 130:
+                return 'leave';
+            case 131:
+                return 'kick';
+            case 3:
+                return 'kick_me';
+            default:
+                return 'kick';
         }
     }
 
@@ -1049,7 +1071,7 @@ export class OneBotMsgApi {
                         }
                     }
                     return false;
-                }, 1, 1000).catch(undefined);
+                }, 1, 1000).catch(() => undefined);
             if (dataNotify) {
                 return !dataNotify.actionUser.uid ? dataNotify.user2.uid : dataNotify.actionUser.uid;
             }

src/onebot/event/notice/OB11GroupAdminNoticeEvent.ts

@@ -3,7 +3,7 @@ import { NapCatCore } from '@/core';
 
 export class OB11GroupAdminNoticeEvent extends OB11GroupNoticeEvent {
     notice_type = 'group_admin';
-    sub_type: 'set' | 'unset'; 
+    sub_type: 'set' | 'unset';
 
     constructor(core: NapCatCore, group_id: number, user_id: number, sub_type: 'set' | 'unset') {
         super(core, group_id, user_id);

src/onebot/network/http-server.ts

@@ -9,7 +9,8 @@ import { HttpServerConfig } from '@/onebot/config/config';
 import { NapCatOneBot11Adapter } from '@/onebot';
 import { IOB11NetworkAdapter } from '@/onebot/network/adapter';
 import json5 from 'json5';
-
+import { isFinished } from 'on-finished';
+import typeis from 'type-is';
 export class OB11HttpServerAdapter extends IOB11NetworkAdapter<HttpServerConfig> {
     private app: Express | undefined;
     private server: http.Server | undefined;
@@ -45,13 +46,23 @@ export class OB11HttpServerAdapter extends IOB11NetworkAdapter<HttpServerConfig>
         this.app = undefined;
     }
 
+
     private initializeServer() {
         this.app = express();
         this.server = http.createServer(this.app);
 
         this.app.use(cors());
         this.app.use(express.urlencoded({ extended: true, limit: '5000mb' }));
+
         this.app.use((req, res, next) => {
+            if (isFinished(req)) {
+                next();
+                return;
+            }
+            if (!typeis.hasBody(req)) {
+                next();
+                return;
+            }
             // 兼容处理没有带content-type的请求
             req.headers['content-type'] = 'application/json';
             let rawData = '';
@@ -98,7 +109,7 @@ export class OB11HttpServerAdapter extends IOB11NetworkAdapter<HttpServerConfig>
         if (req.method == 'get') {
             payload = req.query;
         } else if (req.query) {
-            payload = { ...req.query, ...req.body };
+            payload = { ...req.body, ...req.query };
         }
         if (req.path === '' || req.path === '/') {
             const hello = OB11Response.ok({});

src/pty/index.ts

@@ -26,9 +26,4 @@ export function require_dlopen(modulename: string) {
     process.dlopen(module, path.join(import__dirname, modulename));
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return module.exports as any;
-}
-/**
- * Expose the native API when not Windows, note that this is not public API and
- * could be removed at any time.
- */
-export const native = (process.platform !== 'win32' ? require_dlopen('./pty/' + process.platform + '.' + process.arch + '/pty.node') : null);
+}

src/pty/unixTerminal.ts

@@ -13,12 +13,13 @@ import { IProcessEnv, IPtyForkOptions, IPtyOpenOptions } from '@homebridge/node-
 import { ArgvOrCommandLine } from '@homebridge/node-pty-prebuilt-multiarch/src/types';
 import { assign } from '@homebridge/node-pty-prebuilt-multiarch/src/utils';
 import { pty_loader } from './prebuild-loader';
+import { fileURLToPath } from 'url';
 export const pty = pty_loader();
 
 let helperPath: string;
 helperPath = '../build/Release/spawn-helper';
-
-helperPath = path.resolve(__dirname, helperPath);
+const import__dirname = path.dirname(fileURLToPath(import.meta.url));
+helperPath = path.resolve(import__dirname, helperPath);
 helperPath = helperPath.replace('app.asar', 'app.asar.unpacked');
 helperPath = helperPath.replace('node_modules.asar', 'node_modules.asar.unpacked');
 

src/pty/windowsPtyAgent.ts

@@ -14,6 +14,8 @@ import { ArgvOrCommandLine } from '@homebridge/node-pty-prebuilt-multiarch/src/t
 import { fork } from 'child_process';
 import { ConoutConnection } from './windowsConoutConnection';
 import { require_dlopen } from '.';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
 
 let conptyNative: IConptyNative;
 let winptyNative: IWinptyNative;
@@ -149,7 +151,7 @@ export class WindowsPtyAgent {
                 consoleProcessList.forEach((pid: number) => {
                     try {
                         process.kill(pid);
-                    } catch{
+                    } catch {
                         // Ignore if process cannot be found (kill ESRCH error)
                     }
                 });
@@ -176,8 +178,9 @@ export class WindowsPtyAgent {
     }
 
     private _getConsoleProcessList(): Promise<number[]> {
+        const import__dirname = dirname(fileURLToPath(import.meta.url));
         return new Promise<number[]>(resolve => {
-            const agent = fork(path.join(__dirname, 'conpty_console_list_agent'), [this._innerPid.toString()]);
+            const agent = fork(path.join(import__dirname, 'conpty_console_list_agent'), [this._innerPid.toString()]);
             agent.on('message', message => {
                 clearTimeout(timeout);
                 // @ts-expect-error no need to check if it is null

src/shell/base.ts

@@ -223,7 +223,7 @@ async function handleLogin(
                 logger.log(`可用于快速登录的 QQ：\n${historyLoginList
                     .map((u, index) => `${index + 1}. ${u.uin} ${u.nickName}`)
                     .join('\n')
-                }`);
+                    }`);
             }
             loginService.getQRCodePicture();
         }
@@ -236,11 +236,11 @@ async function initializeSession(
 ) {
     return new Promise<void>((resolve, reject) => {
         const sessionListener = new NodeIKernelSessionListener();
-        sessionListener.onSessionInitComplete = (r: unknown) => {
-            if (r === 0) {
+        sessionListener.onOpentelemetryInit = (info) => {
+            if (info.is_init) {
                 resolve();
             } else {
-                reject(new Error('登录异常' + r?.toString()));
+                reject(new Error('opentelemetry init failed'));
             }
         };
         session.init(
@@ -260,7 +260,30 @@ async function initializeSession(
         }
     });
 }
-
+async function handleProxy(session: NodeIQQNTWrapperSession, logger: LogWrapper) {
+    if (process.env['NAPCAT_PROXY_PORT']) {
+        session.getMSFService().setNetworkProxy({
+            userName: '',
+            userPwd: '',
+            address: process.env['NAPCAT_PROXY_ADDRESS'] || '127.0.0.1',
+            port: +process.env['NAPCAT_PROXY_PORT'],
+            proxyType: 2,
+            domain: '',
+            isSocket: true
+        });
+        logger.logWarn('已设置代理', process.env['NAPCAT_PROXY_ADDRESS'], process.env['NAPCAT_PROXY_PORT']);
+    } else if (process.env['NAPCAT_PROXY_CLOSE']) {
+        session.getMSFService().setNetworkProxy({
+            userName: '',
+            userPwd: '',
+            address: '',
+            port: 0,
+            proxyType: 0,
+            domain: '',
+            isSocket: false
+        });
+    }
+}
 export async function NCoreInitShell() {
     console.log('NapCat Shell App Loading...');
     const pathWrapper = new NapCatPathWrapper();
@@ -286,7 +309,7 @@ export async function NCoreInitShell() {
 
     await initializeEngine(engine, basicInfoWrapper, dataPathGlobal, systemPlatform, systemVersion);
     await initializeLoginService(loginService, basicInfoWrapper, dataPathGlobal, systemVersion, hostname);
-
+    handleProxy(session, logger);
     program.option('-q, --qq [number]', 'QQ号').parse(process.argv);
     const cmdOptions = program.opts();
     const quickLoginUin = cmdOptions['qq'];
@@ -294,6 +317,7 @@ export async function NCoreInitShell() {
 
     const dataTimestape = new Date().getTime().toString();
     o3Service.reportAmgomWeather('login', 'a1', [dataTimestape, '0', '0']);
+
     const selfInfo = await handleLogin(loginService, logger, pathWrapper, quickLoginUin, historyLoginList);
     const amgomDataPiece = 'eb1fd6ac257461580dc7438eb099f23aae04ca679f4d88f53072dc56e3bb1129';
     o3Service.setAmgomDataPiece(basicInfoWrapper.QQVersionAppid, new Uint8Array(Buffer.from(amgomDataPiece, 'hex')));
@@ -314,7 +338,15 @@ export async function NCoreInitShell() {
     await initializeSession(session, sessionConfig);
 
     const accountDataPath = path.resolve(dataPath, './NapCat/data');
-    fs.mkdirSync(dataPath, { recursive: true });
+    //判断dataPath是否为根目录 或者 D:/ 之类的盘目录
+    if (dataPath !== '/' && /^[a-zA-Z]:\\$/.test(dataPath) === false) {
+        try {
+            fs.mkdirSync(accountDataPath, { recursive: true });
+        } catch (error) {
+            logger.logError('创建accountDataPath失败', error);
+        }
+    }
+
     logger.logDebug('本账号数据/缓存目录：', accountDataPath);
 
     await new NapCatShell(

src/webui/index.ts

@@ -10,9 +10,10 @@ import { WebUiConfigWrapper } from '@webapi/helper/config';
 import { ALLRouter } from '@webapi/router';
 import { cors } from '@webapi/middleware/cors';
 import { createUrl } from '@webapi/utils/url';
-import { sendSuccess } from '@webapi/utils/response';
+import { sendError } from '@webapi/utils/response';
 import { join } from 'node:path';
 import { terminalManager } from '@webapi/terminal/terminal_manager';
+import multer from 'multer'; // 新增：引入multer用于错误捕获
 
 // 实例化Express
 const app = express();
@@ -25,16 +26,43 @@ const server = createServer(app);
  */
 export let WebUiConfig: WebUiConfigWrapper;
 export let webUiPathWrapper: NapCatPathWrapper;
+const MAX_PORT_TRY = 100;
+import * as net from 'node:net';
+import { WebUiDataRuntime } from './src/helper/Data';
+
+export async function InitPort(parsedConfig: WebUiConfigType): Promise<[string, number, string]> {
+    try {
+        await tryUseHost(parsedConfig.host);
+        const port = await tryUsePort(parsedConfig.port, parsedConfig.host);
+        return [parsedConfig.host, port, parsedConfig.token];
+    } catch (error) {
+        console.log('host或port不可用', error);
+        return ['', 0, ''];
+    }
+}
 
 export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapper) {
     webUiPathWrapper = pathWrapper;
     WebUiConfig = new WebUiConfigWrapper();
-    const config = await WebUiConfig.GetWebUIConfig();
-    if (config.port == 0) {
+    const [host, port, token] = await InitPort(await WebUiConfig.GetWebUIConfig());
+    if (port == 0) {
         logger.log('[NapCat] [WebUi] Current WebUi is not run.');
         return;
     }
-
+    setTimeout(async () => {
+        let autoLoginAccount = process.env['NAPCAT_QUICK_ACCOUNT'] || WebUiConfig.getAutoLoginAccount();
+        if (autoLoginAccount) {
+            try {
+                const { result, message } = await WebUiDataRuntime.requestQuickLogin(autoLoginAccount);
+                if (!result) {
+                    throw new Error(message);
+                }
+                console.log(`[NapCat] [WebUi] Auto login account: ${autoLoginAccount}`);
+            } catch (error) {
+                console.log(`[NapCat] [WebUi] Auto login account failed.` + error);
+            }
+        }
+    }, 30000);
     // ------------注册中间件------------
     // 使用express的json中间件
     app.use(express.json());
@@ -42,10 +70,39 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp
     // CORS中间件
     // TODO:
     app.use(cors);
+
+    // 如果是webui字体文件，挂载字体文件
+    app.use('/webui/fonts/AaCute.woff', async (_req, res, next) => {
+        const isFontExist = await WebUiConfig.CheckWebUIFontExist();
+        if (isFontExist) {
+            res.sendFile(WebUiConfig.GetWebUIFontPath());
+        } else {
+            next();
+        }
+    });
+
+    // 如果是自定义色彩，构建一个css文件
+    app.use('/files/theme.css', async (_req, res) => {
+        const colors = await WebUiConfig.GetTheme();
+
+        let css = ':root, .light, [data-theme="light"] {';
+        for (const key in colors.light) {
+            css += `${key}: ${colors.light[key]};`;
+        }
+        css += '}';
+        css += '.dark, [data-theme="dark"] {';
+        for (const key in colors.dark) {
+            css += `${key}: ${colors.dark[key]};`;
+        }
+        css += '}';
+
+        res.send(css);
+    });
+
     // ------------中间件结束------------
 
     // ------------挂载路由------------
-    // 挂载静态路由（前端），路径为 [/前缀]/webui
+    // 挂载静态路由（前端），路径为 /webui
     app.use('/webui', express.static(pathWrapper.staticPath));
     // 初始化WebSocket服务器
     server.on('upgrade', (request, socket, head) => {
@@ -62,21 +119,91 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp
 
     // 初始服务（先放个首页）
     app.all('/', (_req, res) => {
-        sendSuccess(res, null, 'NapCat WebAPI is now running!');
+        res.status(301).header('Location', '/webui').send();
+    });
+
+    // 错误处理中间件，捕获multer的错误
+    app.use((err: Error, _: express.Request, res: express.Response, next: express.NextFunction) => {
+        if (err instanceof multer.MulterError) {
+            return sendError(res, err.message, true);
+        }
+        next(err);
+    });
+
+    // 全局错误处理中间件（非multer错误）
+    app.use((_: Error, __: express.Request, res: express.Response, ___: express.NextFunction) => {
+        sendError(res, 'An unknown error occurred.', true);
     });
-    // ------------路由挂载结束------------
 
     // ------------启动服务------------
-    server.listen(config.port, config.host, async () => {
+    server.listen(port, host, async () => {
         // 启动后打印出相关地址
-        const port = config.port.toString(),
-            searchParams = { token: config.token };
-        if (config.host !== '' && config.host !== '0.0.0.0') {
+        let searchParams = { token: token };
+        if (host !== '' && host !== '0.0.0.0') {
             logger.log(
-                `[NapCat] [WebUi] WebUi User Panel Url: ${createUrl(config.host, port, '/webui', searchParams)}`
+                `[NapCat] [WebUi] WebUi User Panel Url: ${createUrl(host, port.toString(), '/webui', searchParams)}`
             );
         }
-        logger.log(`[NapCat] [WebUi] WebUi Local Panel Url: ${createUrl('127.0.0.1', port, '/webui', searchParams)}`);
+        logger.log(
+            `[NapCat] [WebUi] WebUi Local Panel Url: ${createUrl('127.0.0.1', port.toString(), '/webui', searchParams)}`
+        );
     });
     // ------------Over！------------
 }
+
+async function tryUseHost(host: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+        try {
+            const server = net.createServer();
+            server.on('listening', () => {
+                server.close();
+                resolve(host);
+            });
+
+            server.on('error', (err: any) => {
+                if (err.code === 'EADDRNOTAVAIL') {
+                    reject(new Error('主机地址验证失败，可能为非本机地址'));
+                } else {
+                    reject(new Error(`遇到错误: ${err.code}`));
+                }
+            });
+
+            // 尝试监听 让系统随机分配一个端口
+            server.listen(0, host);
+        } catch (error) {
+            // 这里捕获到的错误应该是启动服务器时的同步错误
+            reject(new Error(`服务器启动时发生错误: ${error}`));
+        }
+    });
+}
+
+async function tryUsePort(port: number, host: string, tryCount: number = 0): Promise<number> {
+    return new Promise((resolve, reject) => {
+        try {
+            const server = net.createServer();
+            server.on('listening', () => {
+                server.close();
+                resolve(port);
+            });
+
+            server.on('error', (err: any) => {
+                if (err.code === 'EADDRINUSE') {
+                    if (tryCount < MAX_PORT_TRY) {
+                        // 使用循环代替递归
+                        resolve(tryUsePort(port + 1, host, tryCount + 1));
+                    } else {
+                        reject(new Error(`端口尝试失败，达到最大尝试次数: ${MAX_PORT_TRY}`));
+                    }
+                } else {
+                    reject(new Error(`遇到错误: ${err.code}`));
+                }
+            });
+
+            // 尝试监听端口
+            server.listen(port, host);
+        } catch (error) {
+            // 这里捕获到的错误应该是启动服务器时的同步错误
+            reject(new Error(`服务器启动时发生错误: ${error}`));
+        }
+    });
+}

src/webui/src/api/Auth.ts

@@ -7,6 +7,15 @@ import { WebUiDataRuntime } from '@webapi/helper/Data';
 import { sendSuccess, sendError } from '@webapi/utils/response';
 import { isEmpty } from '@webapi/utils/check';
 
+// 检查是否使用默认Token
+export const CheckDefaultTokenHandler: RequestHandler = async (_, res) => {
+    const webuiToken = await WebUiConfig.GetWebUIConfig();
+    if (webuiToken.token === 'napcat') {
+        return sendSuccess(res, true);
+    }
+    return sendSuccess(res, false);
+};
+
 // 登录
 export const LoginHandler: RequestHandler = async (req, res) => {
     // 获取WebUI配置
@@ -93,7 +102,7 @@ export const UpdateTokenHandler: RequestHandler = async (req, res) => {
     try {
         // 注销当前的Token
         if (authorization) {
-            const CredentialBase64: string = authorization.split(' ')[1];
+            const CredentialBase64: string = authorization.split(' ')[1] as string;
             const Credential = JSON.parse(Buffer.from(CredentialBase64, 'base64').toString());
             AuthHelper.revokeCredential(Credential);
         }

src/webui/src/api/BaseInfo.ts

@@ -2,14 +2,25 @@ import { RequestHandler } from 'express';
 import { WebUiDataRuntime } from '@webapi/helper/Data';
 
 import { sendSuccess } from '@webapi/utils/response';
+import { WebUiConfig } from '@/webui';
 
 export const PackageInfoHandler: RequestHandler = (_, res) => {
     const data = WebUiDataRuntime.getPackageJson();
     sendSuccess(res, data);
 };
 
-
 export const QQVersionHandler: RequestHandler = (_, res) => {
     const data = WebUiDataRuntime.getQQVersion();
     sendSuccess(res, data);
 };
+
+export const GetThemeConfigHandler: RequestHandler = async (_, res) => {
+    const data = await WebUiConfig.GetTheme();
+    sendSuccess(res, data);
+};
+
+export const SetThemeConfigHandler: RequestHandler = async (req, res) => {
+    const { theme } = req.body;
+    await WebUiConfig.UpdateTheme(theme);
+    sendSuccess(res, { message: '更新成功' });
+};

src/webui/src/api/File.ts

@@ -1,4 +1,4 @@
-import type { RequestHandler, Request } from 'express';
+import type { RequestHandler } from 'express';
 import { sendError, sendSuccess } from '../utils/response';
 import fsProm from 'fs/promises';
 import fs from 'fs';
@@ -7,7 +7,9 @@ import os from 'os';
 import compressing from 'compressing';
 import { PassThrough } from 'stream';
 import multer from 'multer';
-import { randomUUID } from 'crypto';
+import webUIFontUploader from '../uploader/webui_font';
+import diskUploader from '../uploader/disk';
+import { WebUiConfig } from '@/webui';
 
 const isWindows = os.platform() === 'win32';
 
@@ -268,11 +270,11 @@ export const BatchMoveHandler: RequestHandler = async (req, res) => {
 // 新增：文件下载处理方法（注意流式传输，不将整个文件读入内存）
 export const DownloadHandler: RequestHandler = async (req, res) => {
     try {
-        const filePath = normalizePath( req.query[ 'path' ] as string );
+        const filePath = normalizePath(req.query['path'] as string);
         if (!filePath) {
-            return sendError( res, '参数错误' );
+            return sendError(res, '参数错误');
         }
-        
+
         const stat = await fsProm.stat(filePath);
 
         res.setHeader('Content-Type', 'application/octet-stream');
@@ -327,74 +329,71 @@ export const BatchDownloadHandler: RequestHandler = async (req, res) => {
     }
 };
 
-// 修改：使用 Buffer 转码文件名，解决文件上传时乱码问题
-const decodeFileName = (fileName: string): string => {
+// 修改上传处理方法
+export const UploadHandler: RequestHandler = async (req, res) => {
     try {
-        return Buffer.from(fileName, 'binary').toString('utf8');
-    } catch {
-        return fileName;
+        await diskUploader(req, res);
+        return sendSuccess(res, true, '文件上传成功', true);
+    } catch (error) {
+        let errorMessage = '文件上传失败';
+
+        if (error instanceof multer.MulterError) {
+            switch (error.code) {
+                case 'LIMIT_FILE_SIZE':
+                    errorMessage = '文件大小超过限制（40MB）';
+                    break;
+                case 'LIMIT_UNEXPECTED_FILE':
+                    errorMessage = '无效的文件上传字段';
+                    break;
+                default:
+                    errorMessage = `上传错误: ${error.message}`;
+            }
+        } else if (error instanceof Error) {
+            errorMessage = error.message;
+        }
+        return sendError(res, errorMessage, true);
     }
 };
 
-// 修改上传处理方法
-export const UploadHandler: RequestHandler = (req, res) => {
-    const uploadPath = (req.query['path'] || '') as string;
+// 上传WebUI字体文件处理方法
+export const UploadWebUIFontHandler: RequestHandler = async (req, res) => {
+    try {
+        await webUIFontUploader(req, res);
+        return sendSuccess(res, true, '字体文件上传成功', true);
+    } catch (error) {
+        let errorMessage = '字体文件上传失败';
 
-    const storage = multer.diskStorage({
-        destination: (
-            _: Request,
-            file: Express.Multer.File,
-            cb: (error: Error | null, destination: string) => void
-        ) => {
-            try {
-                const decodedName = decodeFileName(file.originalname);
-
-                if (!uploadPath) {
-                    return cb(new Error('上传路径不能为空'), '');
-                }
-
-                if (isWindows && uploadPath === '\\') {
-                    return cb(new Error('根目录不允许上传文件'), '');
-                }
-
-                // 处理文件夹上传的情况
-                if (decodedName.includes('/') || decodedName.includes('\\')) {
-                    const fullPath = path.join(uploadPath, path.dirname(decodedName));
-                    fs.mkdirSync(fullPath, { recursive: true });
-                    cb(null, fullPath);
-                } else {
-                    cb(null, uploadPath);
-                }
-            } catch (error) {
-                cb(error as Error, '');
+        if (error instanceof multer.MulterError) {
+            switch (error.code) {
+                case 'LIMIT_FILE_SIZE':
+                    errorMessage = '字体文件大小超过限制（40MB）';
+                    break;
+                case 'LIMIT_UNEXPECTED_FILE':
+                    errorMessage = '无效的文件上传字段';
+                    break;
+                default:
+                    errorMessage = `上传错误: ${error.message}`;
             }
-        },
-        filename: (_: Request, file: Express.Multer.File, cb: (error: Error | null, filename: string) => void) => {
-            try {
-                const decodedName = decodeFileName(file.originalname);
-                const fileName = path.basename(decodedName);
-
-                // 检查文件是否存在
-                const fullPath = path.join(uploadPath, decodedName);
-                if (fs.existsSync(fullPath)) {
-                    const ext = path.extname(fileName);
-                    const name = path.basename(fileName, ext);
-                    cb(null, `${name}-${randomUUID()}${ext}`);
-                } else {
-                    cb(null, fileName);
-                }
-            } catch (error) {
-                cb(error as Error, '');
-            }
-        },
-    });
-
-    const upload = multer({ storage }).array('files');
-
-    upload(req, res, (err: any) => {
-        if (err) {
-            return sendError(res, err.message || '文件上传失败');
+        } else if (error instanceof Error) {
+            errorMessage = error.message;
         }
-        return sendSuccess(res, true);
-    });
+        return sendError(res, errorMessage, true);
+    }
+};
+
+// 删除WebUI字体文件处理方法
+export const DeleteWebUIFontHandler: RequestHandler = async (_req, res) => {
+    try {
+        const fontPath = WebUiConfig.GetWebUIFontPath();
+        const exists = await WebUiConfig.CheckWebUIFontExist();
+
+        if (!exists) {
+            return sendSuccess(res, true);
+        }
+
+        await fsProm.unlink(fontPath);
+        return sendSuccess(res, true);
+    } catch (error) {
+        return sendError(res, '删除字体文件失败');
+    }
 };

src/webui/src/api/Log.ts

@@ -1,9 +1,10 @@
 import type { RequestHandler } from 'express';
 import { sendError, sendSuccess } from '../utils/response';
-import { WebUiConfigWrapper } from '../helper/config';
 import { logSubscription } from '@/common/log';
 import { terminalManager } from '../terminal/terminal_manager';
-
+import { WebUiConfig } from '@/webui';
+// 判断是否是 macos
+const isMacOS = process.platform === 'darwin';
 // 日志记录
 export const LogHandler: RequestHandler = async (req, res) => {
     const filename = req.query['id'];
@@ -14,13 +15,13 @@ export const LogHandler: RequestHandler = async (req, res) => {
     if (filename.includes('..')) {
         return sendError(res, 'ID不合法');
     }
-    const logContent = await WebUiConfigWrapper.GetLogContent(filename);
+    const logContent = await WebUiConfig.GetLogContent(filename);
     return sendSuccess(res, logContent);
 };
 
 // 日志列表
 export const LogListHandler: RequestHandler = async (_, res) => {
-    const logList = await WebUiConfigWrapper.GetLogsList();
+    const logList = await WebUiConfig.GetLogsList();
     return sendSuccess(res, logList);
 };
 
@@ -43,6 +44,9 @@ export const LogRealTimeHandler: RequestHandler = async (req, res) => {
 
 // 终端相关处理器
 export const CreateTerminalHandler: RequestHandler = async (req, res) => {
+    if (isMacOS) {
+        return sendError(res, 'MacOS不支持终端');
+    }
     try {
         const { cols, rows } = req.body;
         const { id } = terminalManager.createTerminal(cols, rows);

src/webui/src/api/QQLogin.ts

@@ -3,9 +3,10 @@ import { RequestHandler } from 'express';
 import { WebUiDataRuntime } from '@webapi/helper/Data';
 import { isEmpty } from '@webapi/utils/check';
 import { sendError, sendSuccess } from '@webapi/utils/response';
+import { WebUiConfig } from '@/webui';
 
 // 获取QQ登录二维码
-export const QQGetQRcodeHandler: RequestHandler = async (req, res) => {
+export const QQGetQRcodeHandler: RequestHandler = async (_, res) => {
     // 判断是否已经登录
     if (WebUiDataRuntime.getQQLoginStatus()) {
         // 已经登录
@@ -25,7 +26,7 @@ export const QQGetQRcodeHandler: RequestHandler = async (req, res) => {
 };
 
 // 获取QQ登录状态
-export const QQCheckLoginStatusHandler: RequestHandler = async (req, res) => {
+export const QQCheckLoginStatusHandler: RequestHandler = async (_, res) => {
     const data = {
         isLogin: WebUiDataRuntime.getQQLoginStatus(),
         qrcodeurl: WebUiDataRuntime.getQQLoginQrcodeURL(),
@@ -74,3 +75,16 @@ export const getQQLoginInfoHandler: RequestHandler = async (_, res) => {
     const data = WebUiDataRuntime.getQQLoginInfo();
     return sendSuccess(res, data);
 };
+
+// 获取自动登录QQ账号
+export const getAutoLoginAccountHandler: RequestHandler = async (_, res) => {
+    const data = WebUiConfig.getAutoLoginAccount();
+    return sendSuccess(res, data);
+};
+
+// 设置自动登录QQ账号
+export const setAutoLoginAccountHandler: RequestHandler = async (req, res) => {
+    const { uin } = req.body;
+    await WebUiConfig.UpdateAutoLoginAccount(uin);
+    return sendSuccess(res, null);
+};

src/webui/src/helper/config.ts

@@ -1,167 +1,86 @@
 import { webUiPathWrapper } from '@/webui';
+import { Type, Static } from '@sinclair/typebox';
+import Ajv from 'ajv';
 import fs, { constants } from 'node:fs/promises';
-import * as net from 'node:net';
+
 import { resolve } from 'node:path';
 
+import { deepMerge } from '../utils/object';
+import { themeType } from '../types/theme';
+
 // 限制尝试端口的次数，避免死循环
-const MAX_PORT_TRY = 100;
 
-async function tryUseHost(host: string): Promise<string> {
-    return new Promise((resolve, reject) => {
-        try {
-            const server = net.createServer();
-            server.on('listening', () => {
-                server.close();
-                resolve(host);
-            });
+// 定义配置的类型
+const WebUiConfigSchema = Type.Object({
+    host: Type.String({ default: '0.0.0.0' }),
+    port: Type.Number({ default: 6099 }),
+    token: Type.String({ default: 'napcat' }),
+    loginRate: Type.Number({ default: 10 }),
+    autoLoginAccount: Type.String({ default: '' }),
+    theme: themeType,
+});
 
-            server.on('error', (err: any) => {
-                if (err.code === 'EADDRNOTAVAIL') {
-                    reject(new Error('主机地址验证失败，可能为非本机地址'));
-                } else {
-                    reject(new Error(`遇到错误: ${err.code}`));
-                }
-            });
-
-            // 尝试监听 让系统随机分配一个端口
-            server.listen(0, host);
-        } catch (error) {
-            // 这里捕获到的错误应该是启动服务器时的同步错误
-            reject(new Error(`服务器启动时发生错误: ${error}`));
-        }
-    });
-}
-
-async function tryUsePort(port: number, host: string, tryCount: number = 0): Promise<number> {
-    return new Promise((resolve, reject) => {
-        try {
-            const server = net.createServer();
-            server.on('listening', () => {
-                server.close();
-                resolve(port);
-            });
-
-            server.on('error', (err: any) => {
-                if (err.code === 'EADDRINUSE') {
-                    if (tryCount < MAX_PORT_TRY) {
-                        // 使用循环代替递归
-                        resolve(tryUsePort(port + 1, host, tryCount + 1));
-                    } else {
-                        reject(new Error(`端口尝试失败，达到最大尝试次数: ${MAX_PORT_TRY}`));
-                    }
-                } else {
-                    reject(new Error(`遇到错误: ${err.code}`));
-                }
-            });
-
-            // 尝试监听端口
-            server.listen(port, host);
-        } catch (error) {
-            // 这里捕获到的错误应该是启动服务器时的同步错误
-            reject(new Error(`服务器启动时发生错误: ${error}`));
-        }
-    });
-}
+export type WebUiConfigType = Static<typeof WebUiConfigSchema>;
 
 // 读取当前目录下名为 webui.json 的配置文件，如果不存在则创建初始化配置文件
 export class WebUiConfigWrapper {
     WebUiConfigData: WebUiConfigType | undefined = undefined;
 
-    private applyDefaults<T>(obj: Partial<T>, defaults: T): T {
-        const result = { ...defaults } as T;
-        for (const key in obj) {
-            if (obj[key] && typeof obj[key] === 'object' && !Array.isArray(obj[key])) {
-                result[key] = this.applyDefaults(obj[key], defaults[key]);
-            } else if (obj[key] !== undefined) {
-                result[key] = obj[key] as T[Extract<keyof T, string>];
-            }
+    private validateAndApplyDefaults(config: Partial<WebUiConfigType>): WebUiConfigType {
+        new Ajv({ coerceTypes: true, useDefaults: true }).compile(WebUiConfigSchema)(config);
+        return config as WebUiConfigType;
+    }
+
+    private async ensureConfigFileExists(configPath: string): Promise<void> {
+        const configExists = await fs
+            .access(configPath, constants.F_OK)
+            .then(() => true)
+            .catch(() => false);
+        if (!configExists) {
+            await fs.writeFile(configPath, JSON.stringify(this.validateAndApplyDefaults({}), null, 4));
+        }
+    }
+
+    private async readAndValidateConfig(configPath: string): Promise<WebUiConfigType> {
+        const fileContent = await fs.readFile(configPath, 'utf-8');
+        return this.validateAndApplyDefaults(JSON.parse(fileContent));
+    }
+
+    private async writeConfig(configPath: string, config: WebUiConfigType): Promise<void> {
+        const hasWritePermission = await fs
+            .access(configPath, constants.W_OK)
+            .then(() => true)
+            .catch(() => false);
+        if (hasWritePermission) {
+            await fs.writeFile(configPath, JSON.stringify(config, null, 4));
+        } else {
+            console.warn(`文件: ${configPath} 没有写入权限, 配置的更改部分可能会在重启后还原.`);
         }
-        return result;
     }
 
     async GetWebUIConfig(): Promise<WebUiConfigType> {
         if (this.WebUiConfigData) {
             return this.WebUiConfigData;
         }
-        const defaultconfig: WebUiConfigType = {
-            host: '0.0.0.0',
-            port: 6099,
-            token: '', // 默认先填空，空密码无法登录
-            loginRate: 3,
-        };
-        try {
-            defaultconfig.token = Math.random().toString(36).slice(2); //生成随机密码
-        } catch (e) {
-            console.log('随机密码生成失败', e);
-        }
         try {
             const configPath = resolve(webUiPathWrapper.configPath, './webui.json');
-
-            if (
-                !(await fs
-                    .access(configPath, constants.F_OK)
-                    .then(() => true)
-                    .catch(() => false))
-            ) {
-                await fs.writeFile(configPath, JSON.stringify(defaultconfig, null, 4));
-            }
-
-            const fileContent = await fs.readFile(configPath, 'utf-8');
-            const parsedConfig = this.applyDefaults(JSON.parse(fileContent) as Partial<WebUiConfigType>, defaultconfig);
-
-            if (
-                await fs
-                    .access(configPath, constants.W_OK)
-                    .then(() => true)
-                    .catch(() => false)
-            ) {
-                await fs.writeFile(configPath, JSON.stringify(parsedConfig, null, 4));
-            } else {
-                console.warn(`文件: ${configPath} 没有写入权限, 配置的更改部分可能会在重启后还原.`);
-            }
-
-            const [host_err, host] = await tryUseHost(parsedConfig.host)
-                .then((data) => [null, data])
-                .catch((err) => [err, null]);
-            if (host_err) {
-                console.log('host不可用', host_err);
-                parsedConfig.port = 0; // 设置为0，禁用WebUI
-            } else {
-                parsedConfig.host = host;
-                const [port_err, port] = await tryUsePort(parsedConfig.port, parsedConfig.host)
-                    .then((data) => [null, data])
-                    .catch((err) => [err, null]);
-                if (port_err) {
-                    console.log('port不可用', port_err);
-                    parsedConfig.port = 0; // 设置为0，禁用WebUI
-                } else {
-                    parsedConfig.port = port;
-                }
-            }
+            await this.ensureConfigFileExists(configPath);
+            const parsedConfig = await this.readAndValidateConfig(configPath);
             this.WebUiConfigData = parsedConfig;
             return this.WebUiConfigData;
         } catch (e) {
             console.log('读取配置文件失败', e);
+            return this.validateAndApplyDefaults({});
         }
-        return defaultconfig; // 理论上这行代码到不了，到了只能返回默认配置了
     }
 
     async UpdateWebUIConfig(newConfig: Partial<WebUiConfigType>): Promise<void> {
         const configPath = resolve(webUiPathWrapper.configPath, './webui.json');
         const currentConfig = await this.GetWebUIConfig();
-        const updatedConfig = this.applyDefaults(newConfig, currentConfig);
-
-        if (
-            await fs
-                .access(configPath, constants.W_OK)
-                .then(() => true)
-                .catch(() => false)
-        ) {
-            await fs.writeFile(configPath, JSON.stringify(updatedConfig, null, 4));
-            this.WebUiConfigData = updatedConfig;
-        } else {
-            console.warn(`文件: ${configPath} 没有写入权限, 配置的更改部分可能会在重启后还原.`);
-        }
+        const mergedConfig = deepMerge({ ...currentConfig }, newConfig);
+        const updatedConfig = this.validateAndApplyDefaults(mergedConfig);
+        await this.writeConfig(configPath, updatedConfig);
+        this.WebUiConfigData = updatedConfig;
     }
 
     async UpdateToken(oldToken: string, newToken: string): Promise<void> {
@@ -173,34 +92,88 @@ export class WebUiConfigWrapper {
     }
 
     // 获取日志文件夹路径
-    public static async GetLogsPath(): Promise<string> {
+    async GetLogsPath(): Promise<string> {
         return resolve(webUiPathWrapper.logsPath);
     }
+
     // 获取日志列表
-    public static async GetLogsList(): Promise<string[]> {
-        if (
-            await fs
-                .access(webUiPathWrapper.logsPath, constants.F_OK)
-                .then(() => true)
-                .catch(() => false)
-        ) {
-            return (await fs.readdir(webUiPathWrapper.logsPath))
+    async GetLogsList(): Promise<string[]> {
+        const logsPath = resolve(webUiPathWrapper.logsPath);
+        const logsExist = await fs
+            .access(logsPath, constants.F_OK)
+            .then(() => true)
+            .catch(() => false);
+        if (logsExist) {
+            return (await fs.readdir(logsPath))
                 .filter((file) => file.endsWith('.log'))
                 .map((file) => file.replace('.log', ''));
         }
         return [];
     }
+
     // 获取指定日志文件内容
-    public static async GetLogContent(filename: string): Promise<string> {
+    async GetLogContent(filename: string): Promise<string> {
         const logPath = resolve(webUiPathWrapper.logsPath, `${filename}.log`);
-        if (
-            await fs
-                .access(logPath, constants.R_OK)
-                .then(() => true)
-                .catch(() => false)
-        ) {
+        const logExists = await fs
+            .access(logPath, constants.R_OK)
+            .then(() => true)
+            .catch(() => false);
+        if (logExists) {
             return await fs.readFile(logPath, 'utf-8');
         }
         return '';
     }
+
+    // 获取字体文件夹内的字体列表
+    async GetFontList(): Promise<string[]> {
+        const fontsPath = resolve(webUiPathWrapper.configPath, './fonts');
+        const fontsExist = await fs
+            .access(fontsPath, constants.F_OK)
+            .then(() => true)
+            .catch(() => false);
+        if (fontsExist) {
+            return (await fs.readdir(fontsPath)).filter((file) => file.endsWith('.ttf'));
+        }
+        return [];
+    }
+
+    // 判断字体是否存在（webui.woff）
+    async CheckWebUIFontExist(): Promise<boolean> {
+        const fontsPath = resolve(webUiPathWrapper.configPath, './fonts');
+        return await fs
+            .access(resolve(fontsPath, './webui.woff'), constants.F_OK)
+            .then(() => true)
+            .catch(() => false);
+    }
+
+    // 获取webui字体文件路径
+    GetWebUIFontPath(): string {
+        return resolve(webUiPathWrapper.configPath, './fonts/webui.woff');
+    }
+
+    getAutoLoginAccount(): string | undefined {
+        return this.WebUiConfigData?.autoLoginAccount;
+    }
+
+    // 获取自动登录账号
+    async GetAutoLoginAccount(): Promise<string> {
+        return (await this.GetWebUIConfig()).autoLoginAccount;
+    }
+
+    // 更新自动登录账号
+    async UpdateAutoLoginAccount(uin: string): Promise<void> {
+        await this.UpdateWebUIConfig({ autoLoginAccount: uin });
+    }
+
+    // 获取主题内容
+    async GetTheme(): Promise<WebUiConfigType['theme']> {
+        const config = await this.GetWebUIConfig();
+
+        return config.theme;
+    }
+
+    // 更新主题内容
+    async UpdateTheme(theme: WebUiConfigType['theme']): Promise<void> {
+        await this.UpdateWebUIConfig({ theme: theme });
+    }
 }

src/webui/src/router/Base.ts

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { PackageInfoHandler, QQVersionHandler } from '../api/BaseInfo';
+import { GetThemeConfigHandler, PackageInfoHandler, QQVersionHandler, SetThemeConfigHandler } from '../api/BaseInfo';
 import { StatusRealTimeHandler } from '@webapi/api/Status';
 import { GetProxyHandler } from '../api/Proxy';
 
@@ -9,4 +9,7 @@ router.get('/QQVersion', QQVersionHandler);
 router.get('/PackageInfo', PackageInfoHandler);
 router.get('/GetSysStatusRealTime', StatusRealTimeHandler);
 router.get('/proxy', GetProxyHandler);
+router.get('/Theme', GetThemeConfigHandler);
+router.post('/SetTheme', SetThemeConfigHandler);
+
 export { router as BaseRouter };

src/webui/src/router/File.ts

@@ -13,7 +13,9 @@ import {
     BatchMoveHandler,
     DownloadHandler,
     BatchDownloadHandler, // 新增下载处理方法
-    UploadHandler, // 添加上传处理器
+    UploadHandler,
+    UploadWebUIFontHandler,
+    DeleteWebUIFontHandler, // 添加上传处理器
 } from '../api/File';
 
 const router = Router();
@@ -21,6 +23,9 @@ const router = Router();
 const apiLimiter = rateLimit({
     windowMs: 1 * 60 * 1000, // 1分钟内
     max: 60, // 最大60个请求
+    validate: {
+        xForwardedForHeader: false,
+    },
 });
 
 router.use(apiLimiter);
@@ -37,5 +42,8 @@ router.post('/move', MoveHandler);
 router.post('/batchMove', BatchMoveHandler);
 router.post('/download', DownloadHandler);
 router.post('/batchDownload', BatchDownloadHandler);
-router.post('/upload', UploadHandler); // 添加上传处理路由
+router.post('/upload', UploadHandler);
+
+router.post('/font/upload/webui', UploadWebUIFontHandler);
+router.post('/font/delete/webui', DeleteWebUIFontHandler);
 export { router as FileRouter };

src/webui/src/router/QQLogin.ts

@@ -7,6 +7,8 @@ import {
     QQSetQuickLoginHandler,
     QQGetLoginListNewHandler,
     getQQLoginInfoHandler,
+    getAutoLoginAccountHandler,
+    setAutoLoginAccountHandler,
 } from '@webapi/api/QQLogin';
 
 const router = Router();
@@ -22,5 +24,9 @@ router.post('/GetQQLoginQrcode', QQGetQRcodeHandler);
 router.post('/SetQuickLogin', QQSetQuickLoginHandler);
 // router:获取QQ登录信息
 router.post('/GetQQLoginInfo', getQQLoginInfoHandler);
+// router:获取快速登录QQ账号
+router.post('/GetQuickLoginQQ', getAutoLoginAccountHandler);
+// router:设置自动登录QQ账号
+router.post('/SetQuickLoginQQ', setAutoLoginAccountHandler);
 
 export { router as QQLoginRouter };

src/webui/src/router/auth.ts

@@ -1,6 +1,12 @@
 import { Router } from 'express';
 
-import { checkHandler, LoginHandler, LogoutHandler, UpdateTokenHandler } from '@webapi/api/Auth';
+import {
+    CheckDefaultTokenHandler,
+    checkHandler,
+    LoginHandler,
+    LogoutHandler,
+    UpdateTokenHandler,
+} from '@webapi/api/Auth';
 
 const router = Router();
 // router:登录
@@ -11,5 +17,7 @@ router.post('/check', checkHandler);
 router.post('/logout', LogoutHandler);
 // router:更新token
 router.post('/update_token', UpdateTokenHandler);
+// router:检查默认token
+router.get('/check_using_default_token', CheckDefaultTokenHandler);
 
 export { router as AuthRouter };

src/webui/src/types/theme.ts

@@ -0,0 +1,260 @@
+import { Type } from '@sinclair/typebox';
+
+export const themeType = Type.Object(
+    {
+        dark: Type.Record(Type.String(), Type.String()),
+        light: Type.Record(Type.String(), Type.String()),
+    },
+    {
+        default: {
+            dark: {
+                '--heroui-background': '0 0% 0%',
+                '--heroui-foreground-50': '240 5.88% 10%',
+                '--heroui-foreground-100': '240 3.7% 15.88%',
+                '--heroui-foreground-200': '240 5.26% 26.08%',
+                '--heroui-foreground-300': '240 5.2% 33.92%',
+                '--heroui-foreground-400': '240 3.83% 46.08%',
+                '--heroui-foreground-500': '240 5.03% 64.9%',
+                '--heroui-foreground-600': '240 4.88% 83.92%',
+                '--heroui-foreground-700': '240 5.88% 90%',
+                '--heroui-foreground-800': '240 4.76% 95.88%',
+                '--heroui-foreground-900': '0 0% 98.04%',
+                '--heroui-foreground': '210 5.56% 92.94%',
+                '--heroui-focus': '212.01999999999998 100% 46.67%',
+                '--heroui-overlay': '0 0% 0%',
+                '--heroui-divider': '0 0% 100%',
+                '--heroui-divider-opacity': '0.15',
+                '--heroui-content1': '240 5.88% 10%',
+                '--heroui-content1-foreground': '0 0% 98.04%',
+                '--heroui-content2': '240 3.7% 15.88%',
+                '--heroui-content2-foreground': '240 4.76% 95.88%',
+                '--heroui-content3': '240 5.26% 26.08%',
+                '--heroui-content3-foreground': '240 5.88% 90%',
+                '--heroui-content4': '240 5.2% 33.92%',
+                '--heroui-content4-foreground': '240 4.88% 83.92%',
+                '--heroui-default-50': '240 5.88% 10%',
+                '--heroui-default-100': '240 3.7% 15.88%',
+                '--heroui-default-200': '240 5.26% 26.08%',
+                '--heroui-default-300': '240 5.2% 33.92%',
+                '--heroui-default-400': '240 3.83% 46.08%',
+                '--heroui-default-500': '240 5.03% 64.9%',
+                '--heroui-default-600': '240 4.88% 83.92%',
+                '--heroui-default-700': '240 5.88% 90%',
+                '--heroui-default-800': '240 4.76% 95.88%',
+                '--heroui-default-900': '0 0% 98.04%',
+                '--heroui-default-foreground': '0 0% 100%',
+                '--heroui-default': '240 5.26% 26.08%',
+                '--heroui-danger-50': '301.89 82.61% 22.55%',
+                '--heroui-danger-100': '308.18 76.39% 28.24%',
+                '--heroui-danger-200': '313.85 70.65% 36.08%',
+                '--heroui-danger-300': '319.73 65.64% 44.51%',
+                '--heroui-danger-400': '325.82 69.62% 53.53%',
+                '--heroui-danger-500': '331.82 75% 65.49%',
+                '--heroui-danger-600': '337.84 83.46% 73.92%',
+                '--heroui-danger-700': '343.42 90.48% 83.53%',
+                '--heroui-danger-800': '350.53 90.48% 91.76%',
+                '--heroui-danger-900': '324 90.91% 95.69%',
+                '--heroui-danger-foreground': '0 0% 100%',
+                '--heroui-danger': '325.82 69.62% 53.53%',
+                '--heroui-primary-50': '340 84.91% 10.39%',
+                '--heroui-primary-100': '339.33 86.54% 20.39%',
+                '--heroui-primary-200': '339.11 85.99% 30.78%',
+                '--heroui-primary-300': '339 86.54% 40.78%',
+                '--heroui-primary-400': '339.2 90.36% 51.18%',
+                '--heroui-primary-500': '339 90% 60.78%',
+                '--heroui-primary-600': '339.11 90.6% 70.78%',
+                '--heroui-primary-700': '339.33 90% 80.39%',
+                '--heroui-primary-800': '340 91.84% 90.39%',
+                '--heroui-primary-900': '339.13 92% 95.1%',
+                '--heroui-primary-foreground': '0 0% 100%',
+                '--heroui-primary': '339.2 90.36% 51.18%',
+                '--heroui-secondary-50': '270 66.67% 9.41%',
+                '--heroui-secondary-100': '270 66.67% 18.82%',
+                '--heroui-secondary-200': '270 66.67% 28.24%',
+                '--heroui-secondary-300': '270 66.67% 37.65%',
+                '--heroui-secondary-400': '270 66.67% 47.06%',
+                '--heroui-secondary-500': '270 59.26% 57.65%',
+                '--heroui-secondary-600': '270 59.26% 68.24%',
+                '--heroui-secondary-700': '270 59.26% 78.82%',
+                '--heroui-secondary-800': '270 59.26% 89.41%',
+                '--heroui-secondary-900': '270 61.54% 94.9%',
+                '--heroui-secondary-foreground': '0 0% 100%',
+                '--heroui-secondary': '270 59.26% 57.65%',
+                '--heroui-success-50': '145.71 77.78% 8.82%',
+                '--heroui-success-100': '146.2 79.78% 17.45%',
+                '--heroui-success-200': '145.79 79.26% 26.47%',
+                '--heroui-success-300': '146.01 79.89% 35.1%',
+                '--heroui-success-400': '145.96 79.46% 43.92%',
+                '--heroui-success-500': '146.01 62.45% 55.1%',
+                '--heroui-success-600': '145.79 62.57% 66.47%',
+                '--heroui-success-700': '146.2 61.74% 77.45%',
+                '--heroui-success-800': '145.71 61.4% 88.82%',
+                '--heroui-success-900': '146.67 64.29% 94.51%',
+                '--heroui-success-foreground': '0 0% 0%',
+                '--heroui-success': '145.96 79.46% 43.92%',
+                '--heroui-warning-50': '37.14 75% 10.98%',
+                '--heroui-warning-100': '37.14 75% 21.96%',
+                '--heroui-warning-200': '36.96 73.96% 33.14%',
+                '--heroui-warning-300': '37.01 74.22% 44.12%',
+                '--heroui-warning-400': '37.03 91.27% 55.1%',
+                '--heroui-warning-500': '37.01 91.26% 64.12%',
+                '--heroui-warning-600': '36.96 91.24% 73.14%',
+                '--heroui-warning-700': '37.14 91.3% 81.96%',
+                '--heroui-warning-800': '37.14 91.3% 90.98%',
+                '--heroui-warning-900': '54.55 91.67% 95.29%',
+                '--heroui-warning-foreground': '0 0% 0%',
+                '--heroui-warning': '37.03 91.27% 55.1%',
+                '--heroui-code-background': '240 5.56% 7.06%',
+                '--heroui-strong': '190.14 94.67% 44.12%',
+                '--heroui-code-mdx': '190.14 94.67% 44.12%',
+                '--heroui-divider-weight': '1px',
+                '--heroui-disabled-opacity': '.5',
+                '--heroui-font-size-tiny': '0.75rem',
+                '--heroui-font-size-small': '0.875rem',
+                '--heroui-font-size-medium': '1rem',
+                '--heroui-font-size-large': '1.125rem',
+                '--heroui-line-height-tiny': '1rem',
+                '--heroui-line-height-small': '1.25rem',
+                '--heroui-line-height-medium': '1.5rem',
+                '--heroui-line-height-large': '1.75rem',
+                '--heroui-radius-small': '8px',
+                '--heroui-radius-medium': '12px',
+                '--heroui-radius-large': '14px',
+                '--heroui-border-width-small': '1px',
+                '--heroui-border-width-medium': '2px',
+                '--heroui-border-width-large': '3px',
+                '--heroui-box-shadow-small':
+                    '0px 0px 5px 0px rgba(0, 0, 0, .05), 0px 2px 10px 0px rgba(0, 0, 0, .2), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+                '--heroui-box-shadow-medium':
+                    '0px 0px 15px 0px rgba(0, 0, 0, .06), 0px 2px 30px 0px rgba(0, 0, 0, .22), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+                '--heroui-box-shadow-large':
+                    '0px 0px 30px 0px rgba(0, 0, 0, .07), 0px 30px 60px 0px rgba(0, 0, 0, .26), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+                '--heroui-hover-opacity': '.9',
+            },
+            light: {
+                '--heroui-background': '0 0% 100%',
+                '--heroui-foreground-50': '240 5.88% 95%',
+                '--heroui-foreground-100': '240 3.7% 90%',
+                '--heroui-foreground-200': '240 5.26% 80%',
+                '--heroui-foreground-300': '240 5.2% 70%',
+                '--heroui-foreground-400': '240 3.83% 60%',
+                '--heroui-foreground-500': '240 5.03% 50%',
+                '--heroui-foreground-600': '240 4.88% 40%',
+                '--heroui-foreground-700': '240 5.88% 30%',
+                '--heroui-foreground-800': '240 4.76% 20%',
+                '--heroui-foreground-900': '0 0% 10%',
+                '--heroui-foreground': '210 5.56% 7.06%',
+                '--heroui-focus': '212.01999999999998 100% 53.33%',
+                '--heroui-overlay': '0 0% 100%',
+                '--heroui-divider': '0 0% 0%',
+                '--heroui-divider-opacity': '0.85',
+                '--heroui-content1': '240 5.88% 95%',
+                '--heroui-content1-foreground': '0 0% 10%',
+                '--heroui-content2': '240 3.7% 90%',
+                '--heroui-content2-foreground': '240 4.76% 20%',
+                '--heroui-content3': '240 5.26% 80%',
+                '--heroui-content3-foreground': '240 5.88% 30%',
+                '--heroui-content4': '240 5.2% 70%',
+                '--heroui-content4-foreground': '240 4.88% 40%',
+                '--heroui-default-50': '240 5.88% 95%',
+                '--heroui-default-100': '240 3.7% 90%',
+                '--heroui-default-200': '240 5.26% 80%',
+                '--heroui-default-300': '240 5.2% 70%',
+                '--heroui-default-400': '240 3.83% 60%',
+                '--heroui-default-500': '240 5.03% 50%',
+                '--heroui-default-600': '240 4.88% 40%',
+                '--heroui-default-700': '240 5.88% 30%',
+                '--heroui-default-800': '240 4.76% 20%',
+                '--heroui-default-900': '0 0% 10%',
+                '--heroui-default-foreground': '0 0% 0%',
+                '--heroui-default': '240 5.26% 80%',
+                '--heroui-danger-50': '324 90.91% 95.69%',
+                '--heroui-danger-100': '350.53 90.48% 91.76%',
+                '--heroui-danger-200': '343.42 90.48% 83.53%',
+                '--heroui-danger-300': '337.84 83.46% 73.92%',
+                '--heroui-danger-400': '331.82 75% 65.49%',
+                '--heroui-danger-500': '325.82 69.62% 53.53%',
+                '--heroui-danger-600': '319.73 65.64% 44.51%',
+                '--heroui-danger-700': '313.85 70.65% 36.08%',
+                '--heroui-danger-800': '308.18 76.39% 28.24%',
+                '--heroui-danger-900': '301.89 82.61% 22.55%',
+                '--heroui-danger-foreground': '0 0% 100%',
+                '--heroui-danger': '325.82 69.62% 53.53%',
+                '--heroui-primary-50': '339.13 92% 95.1%',
+                '--heroui-primary-100': '340 91.84% 90.39%',
+                '--heroui-primary-200': '339.33 90% 80.39%',
+                '--heroui-primary-300': '339.11 90.6% 70.78%',
+                '--heroui-primary-400': '339 90% 60.78%',
+                '--heroui-primary-500': '339.2 90.36% 51.18%',
+                '--heroui-primary-600': '339 86.54% 40.78%',
+                '--heroui-primary-700': '339.11 85.99% 30.78%',
+                '--heroui-primary-800': '339.33 86.54% 20.39%',
+                '--heroui-primary-900': '340 84.91% 10.39%',
+                '--heroui-primary-foreground': '0 0% 100%',
+                '--heroui-primary': '339.2 90.36% 51.18%',
+                '--heroui-secondary-50': '270 61.54% 94.9%',
+                '--heroui-secondary-100': '270 59.26% 89.41%',
+                '--heroui-secondary-200': '270 59.26% 78.82%',
+                '--heroui-secondary-300': '270 59.26% 68.24%',
+                '--heroui-secondary-400': '270 59.26% 57.65%',
+                '--heroui-secondary-500': '270 66.67% 47.06%',
+                '--heroui-secondary-600': '270 66.67% 37.65%',
+                '--heroui-secondary-700': '270 66.67% 28.24%',
+                '--heroui-secondary-800': '270 66.67% 18.82%',
+                '--heroui-secondary-900': '270 66.67% 9.41%',
+                '--heroui-secondary-foreground': '0 0% 100%',
+                '--heroui-secondary': '270 66.67% 47.06%',
+                '--heroui-success-50': '146.67 64.29% 94.51%',
+                '--heroui-success-100': '145.71 61.4% 88.82%',
+                '--heroui-success-200': '146.2 61.74% 77.45%',
+                '--heroui-success-300': '145.79 62.57% 66.47%',
+                '--heroui-success-400': '146.01 62.45% 55.1%',
+                '--heroui-success-500': '145.96 79.46% 43.92%',
+                '--heroui-success-600': '146.01 79.89% 35.1%',
+                '--heroui-success-700': '145.79 79.26% 26.47%',
+                '--heroui-success-800': '146.2 79.78% 17.45%',
+                '--heroui-success-900': '145.71 77.78% 8.82%',
+                '--heroui-success-foreground': '0 0% 0%',
+                '--heroui-success': '145.96 79.46% 43.92%',
+                '--heroui-warning-50': '54.55 91.67% 95.29%',
+                '--heroui-warning-100': '37.14 91.3% 90.98%',
+                '--heroui-warning-200': '37.14 91.3% 81.96%',
+                '--heroui-warning-300': '36.96 91.24% 73.14%',
+                '--heroui-warning-400': '37.01 91.26% 64.12%',
+                '--heroui-warning-500': '37.03 91.27% 55.1%',
+                '--heroui-warning-600': '37.01 74.22% 44.12%',
+                '--heroui-warning-700': '36.96 73.96% 33.14%',
+                '--heroui-warning-800': '37.14 75% 21.96%',
+                '--heroui-warning-900': '37.14 75% 10.98%',
+                '--heroui-warning-foreground': '0 0% 0%',
+                '--heroui-warning': '37.03 91.27% 55.1%',
+                '--heroui-code-background': '221.25 17.39% 18.04%',
+                '--heroui-strong': '316.95 100% 65.29%',
+                '--heroui-code-mdx': '316.95 100% 65.29%',
+                '--heroui-divider-weight': '1px',
+                '--heroui-disabled-opacity': '.5',
+                '--heroui-font-size-tiny': '0.75rem',
+                '--heroui-font-size-small': '0.875rem',
+                '--heroui-font-size-medium': '1rem',
+                '--heroui-font-size-large': '1.125rem',
+                '--heroui-line-height-tiny': '1rem',
+                '--heroui-line-height-small': '1.25rem',
+                '--heroui-line-height-medium': '1.5rem',
+                '--heroui-line-height-large': '1.75rem',
+                '--heroui-radius-small': '8px',
+                '--heroui-radius-medium': '12px',
+                '--heroui-radius-large': '14px',
+                '--heroui-border-width-small': '1px',
+                '--heroui-border-width-medium': '2px',
+                '--heroui-border-width-large': '3px',
+                '--heroui-box-shadow-small':
+                    '0px 0px 5px 0px rgba(0, 0, 0, .02), 0px 2px 10px 0px rgba(0, 0, 0, .06), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+                '--heroui-box-shadow-medium':
+                    '0px 0px 15px 0px rgba(0, 0, 0, .03), 0px 2px 30px 0px rgba(0, 0, 0, .08), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+                '--heroui-box-shadow-large':
+                    '0px 0px 30px 0px rgba(0, 0, 0, .04), 0px 30px 60px 0px rgba(0, 0, 0, .12), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+                '--heroui-hover-opacity': '.8',
+            },
+        },
+    }
+);

src/webui/src/uploader/disk.ts

@@ -0,0 +1,85 @@
+import multer from 'multer';
+import { Request, Response } from 'express';
+import fs from 'fs';
+import path from 'path';
+import { randomUUID } from 'crypto';
+const isWindows = process.platform === 'win32';
+
+// 修改：使用 Buffer 转码文件名，解决文件上传时乱码问题
+const decodeFileName = (fileName: string): string => {
+    try {
+        return Buffer.from(fileName, 'binary').toString('utf8');
+    } catch {
+        return fileName;
+    }
+};
+
+export const createDiskStorage = (uploadPath: string) => {
+    return multer.diskStorage({
+        destination: (
+            _: Request,
+            file: Express.Multer.File,
+            cb: (error: Error | null, destination: string) => void
+        ) => {
+            try {
+                const decodedName = decodeFileName(file.originalname);
+
+                if (!uploadPath) {
+                    return cb(new Error('上传路径不能为空'), '');
+                }
+
+                if (isWindows && uploadPath === '\\') {
+                    return cb(new Error('根目录不允许上传文件'), '');
+                }
+
+                // 处理文件夹上传的情况
+                if (decodedName.includes('/') || decodedName.includes('\\')) {
+                    const fullPath = path.join(uploadPath, path.dirname(decodedName));
+                    fs.mkdirSync(fullPath, { recursive: true });
+                    cb(null, fullPath);
+                } else {
+                    cb(null, uploadPath);
+                }
+            } catch (error) {
+                cb(error as Error, '');
+            }
+        },
+        filename: (_: Request, file: Express.Multer.File, cb: (error: Error | null, filename: string) => void) => {
+            try {
+                const decodedName = decodeFileName(file.originalname);
+                const fileName = path.basename(decodedName);
+
+                // 检查文件是否存在
+                const fullPath = path.join(uploadPath, decodedName);
+                if (fs.existsSync(fullPath)) {
+                    const ext = path.extname(fileName);
+                    const name = path.basename(fileName, ext);
+                    cb(null, `${name}-${randomUUID()}${ext}`);
+                } else {
+                    cb(null, fileName);
+                }
+            } catch (error) {
+                cb(error as Error, '');
+            }
+        },
+    });
+};
+
+export const createDiskUpload = (uploadPath: string) => {
+    const upload = multer({ storage: createDiskStorage(uploadPath) }).array('files');
+    return upload;
+};
+
+const diskUploader = (req: Request, res: Response) => {
+    const uploadPath = (req.query['path'] || '') as string;
+    return new Promise((resolve, reject) => {
+        createDiskUpload(uploadPath)(req, res, (error) => {
+            if (error) {
+                // 错误处理
+                return reject(error);
+            }
+            return resolve(true);
+        });
+    });
+};
+export default diskUploader;

src/webui/src/uploader/webui_font.ts

@@ -0,0 +1,52 @@
+import multer from 'multer';
+import { WebUiConfigWrapper } from '../helper/config';
+import path from 'path';
+import fs from 'fs';
+import type { Request, Response } from 'express';
+
+export const webUIFontStorage = multer.diskStorage({
+    destination: (_, __, cb) => {
+        try {
+            const fontsPath = path.dirname(WebUiConfigWrapper.GetWebUIFontPath());
+            // 确保字体目录存在
+            fs.mkdirSync(fontsPath, { recursive: true });
+            cb(null, fontsPath);
+        } catch (error) {
+            // 确保错误信息被正确传递
+            cb(new Error(`创建字体目录失败：${(error as Error).message}`), '');
+        }
+    },
+    filename: (_, __, cb) => {
+        // 统一保存为webui.woff
+        cb(null, 'webui.woff');
+    },
+});
+
+export const webUIFontUpload = multer({
+    storage: webUIFontStorage,
+    fileFilter: (_, file, cb) => {
+        // 再次验证文件类型
+        if (!file.originalname.toLowerCase().endsWith('.woff')) {
+            cb(new Error('只支持WOFF格式的字体文件'));
+            return;
+        }
+        cb(null, true);
+    },
+    limits: {
+        fileSize: 40 * 1024 * 1024, // 限制40MB
+    },
+}).single('file');
+
+const webUIFontUploader = (req: Request, res: Response) => {
+    return new Promise((resolve, reject) => {
+        webUIFontUpload(req, res, (error) => {
+            if (error) {
+                // 错误处理
+                // sendError(res, error.message, true);
+                return reject(error);
+            }
+            return resolve(true);
+        });
+    });
+};
+export default webUIFontUploader;