From b6049e28ffe8449d4ca5fe3f878a704a86fb99fe Mon Sep 17 00:00:00 2001
From: Zhang Minghan <zmh13054618081@dingtalk.com>
Date: Thu, 4 Jan 2024 18:13:02 +0800
Subject: [PATCH] feat: refresh api key feature and image file preview feature

---
 admin/statistic.go                  |  1 +
 app/src-tauri/tauri.conf.json       |  2 +-
 app/src/assets/markdown/all.less    | 19 +++++++++++++++++--
 app/src/components/plugins/file.tsx | 15 +++++++++++++--
 app/src/conf.ts                     |  2 +-
 app/src/dialogs/ApikeyDialog.tsx    |  9 ++++++++-
 app/src/utils/dom.ts                |  4 +++-
 middleware/throttle.go              |  2 --
 utils/config.go                     |  6 ++++++
 9 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/admin/statistic.go b/admin/statistic.go
index af0b3f0b..08385715 100644
--- a/admin/statistic.go
+++ b/admin/statistic.go
@@ -32,5 +32,6 @@ func AnalysisRequest(model string, buffer *utils.Buffer, err error) {
 		return
 	}
 
+	IncrRequest(instance)
 	IncrModelRequest(instance, model, int64(buffer.CountToken()))
 }
diff --git a/app/src-tauri/tauri.conf.json b/app/src-tauri/tauri.conf.json
index 7ff2ea17..0d2e3d58 100644
--- a/app/src-tauri/tauri.conf.json
+++ b/app/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "chatnio",
-    "version": "3.8.0"
+    "version": "3.8.1"
   },
   "tauri": {
     "allowlist": {
diff --git a/app/src/assets/markdown/all.less b/app/src/assets/markdown/all.less
index a2f2aa70..613d6eeb 100644
--- a/app/src/assets/markdown/all.less
+++ b/app/src/assets/markdown/all.less
@@ -5,8 +5,7 @@
 .file-instance {
   cursor: pointer;
   display: flex;
-  flex-direction: row;
-  align-items: center;
+  flex-direction: column;
   margin: 2px 0 !important;
   margin-bottom: 4px !important;
   padding: 6px 12px !important;
@@ -14,6 +13,22 @@
   background: hsla(var(--background-container)) !important;
   border-radius: var(--radius);
 
+  .file-content {
+    background: none !important;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    flex-wrap: wrap;
+  }
+
+  img {
+    max-width: 320px;
+    max-height: 240px;
+    object-fit: cover;
+    border-radius: var(--radius);
+    margin: 0.25rem 0;
+  }
+
   @media (max-width: 668px) {
     & {
       white-space: pre-wrap;
diff --git a/app/src/components/plugins/file.tsx b/app/src/components/plugins/file.tsx
index e346624e..be229262 100644
--- a/app/src/components/plugins/file.tsx
+++ b/app/src/components/plugins/file.tsx
@@ -1,5 +1,6 @@
 import { File } from "lucide-react";
 import { saveAsFile } from "@/utils/dom.ts";
+import { useMemo } from "react";
 
 /**
  * file format:
@@ -12,6 +13,13 @@ import { saveAsFile } from "@/utils/dom.ts";
 export function parseFile(data: string) {
   const filename = data.split("\n")[0].replace("[[", "").replace("]]", "");
   const content = data.replace(`[[${filename}]]\n`, "");
+  const image = useMemo(() => {
+    // get image url from content (like: https://i.imgur.com/xxxxx.png)
+    const match = content
+      .toLowerCase()
+      .match(/(https?:\/\/.*\.(?:png|jpg|jpeg|gif))/);
+    return match ? match[0] : "";
+  }, [filename, content]);
 
   return (
     <div
@@ -23,8 +31,11 @@ export function parseFile(data: string) {
         saveAsFile(filename, content);
       }}
     >
-      <File className={`mr-1`} />
-      <span className={`name`}>{filename}</span>
+      <div className={`file-content`}>
+        <File className={`mr-1`} />
+        <span className={`name`}>{filename}</span>
+      </div>
+      {image && <img src={image} className={`file-image`} alt={""} />}
     </div>
   );
 }
diff --git a/app/src/conf.ts b/app/src/conf.ts
index f8029273..5b8a92b9 100644
--- a/app/src/conf.ts
+++ b/app/src/conf.ts
@@ -14,7 +14,7 @@ import React from "react";
 import { syncSiteInfo } from "@/admin/api/info.ts";
 import { loadPreferenceModels } from "@/utils/storage.ts";
 
-export const version = "3.8.0-rc";
+export const version = "3.8.1";
 export const dev: boolean = getDev();
 export const deploy: boolean = true;
 export let rest_api: string = getRestApi(deploy);
diff --git a/app/src/dialogs/ApikeyDialog.tsx b/app/src/dialogs/ApikeyDialog.tsx
index 34b0dce8..63acbdc5 100644
--- a/app/src/dialogs/ApikeyDialog.tsx
+++ b/app/src/dialogs/ApikeyDialog.tsx
@@ -18,7 +18,7 @@ import {
   getApiKey,
 } from "@/store/api.ts";
 import { Input } from "@/components/ui/input.tsx";
-import { Copy, ExternalLink } from "lucide-react";
+import { Copy, ExternalLink, RotateCw } from "lucide-react";
 import { useToast } from "@/components/ui/use-toast.ts";
 import { copyClipboard } from "@/utils/dom.ts";
 import { useEffectAsync } from "@/utils/hook.ts";
@@ -53,6 +53,13 @@ function ApikeyDialog() {
           <DialogDescription asChild>
             <div className={`api-dialog`}>
               <div className={`api-wrapper`}>
+                <Button
+                  variant={`outline`}
+                  size={`icon`}
+                  onClick={() => getApiKey(dispatch)}
+                >
+                  <RotateCw className={`h-4 w-4`} />
+                </Button>
                 <Input value={key} />
                 <Button variant={`default`} size={`icon`} onClick={copyKey}>
                   <Copy className={`h-4 w-4`} />
diff --git a/app/src/utils/dom.ts b/app/src/utils/dom.ts
index bd063b78..e6125fae 100644
--- a/app/src/utils/dom.ts
+++ b/app/src/utils/dom.ts
@@ -8,7 +8,9 @@ export async function copyClipboard(text: string) {
    */
 
   try {
-    if (navigator.clipboard) return await navigator.clipboard.writeText(text);
+    if (navigator.clipboard && navigator.clipboard.writeText) {
+      return await navigator.clipboard.writeText(text);
+    }
 
     const el = document.createElement("textarea");
     el.value = text;
diff --git a/middleware/throttle.go b/middleware/throttle.go
index c4d45c50..6f3814d8 100644
--- a/middleware/throttle.go
+++ b/middleware/throttle.go
@@ -1,7 +1,6 @@
 package middleware
 
 import (
-	"chat/admin"
 	"chat/utils"
 	"fmt"
 	"github.com/gin-gonic/gin"
@@ -62,7 +61,6 @@ func ThrottleMiddleware() gin.HandlerFunc {
 		ip := c.ClientIP()
 		path := c.Request.URL.Path
 		cache := utils.GetCacheFromContext(c)
-		admin.IncrRequest(cache)
 
 		limiter := GetPrefixMap[Limiter](path, limits)
 		if limiter != nil && limiter.RateLimit(cache, ip, path) {
diff --git a/utils/config.go b/utils/config.go
index ea224216..1b4ae562 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -58,5 +58,11 @@ func RegisterStaticRoute(engine *gin.Engine) {
 		c.File("./app/dist/index.html")
 	})
 
+	// redirect /v1 to /api/v1
+	engine.Any("/v1/*path", func(c *gin.Context) {
+		path := c.Param("path")
+		c.Redirect(301, fmt.Sprintf("/api/v1/%s", path))
+	})
+
 	fmt.Println(`[service] start serving static files from ~/app/dist`)
 }