chore: release 1.10.4

This reverts commit e6db6747

.cursorrules

@@ -0,0 +1 @@
+This chrome extension project use typescript, react, tailwindcss, daisyui.

.env.development

@@ -1 +1,3 @@
 VITE_ENV=web-dev
+VITE_EXTENSION_ID=bciglihaegkdhoogebcdblfhppoilclp
+VITE_REVIEW_URL=https://chrome.google.com/webstore/detail/bciglihaegkdhoogebcdblfhppoilclp/reviews

.env.production_chrome

@@ -1,3 +1,5 @@
 NODE_ENV=production
 
 VITE_ENV=chrome
+VITE_EXTENSION_ID=bciglihaegkdhoogebcdblfhppoilclp
+VITE_REVIEW_URL=https://chrome.google.com/webstore/detail/bciglihaegkdhoogebcdblfhppoilclp/reviews

.env.production_edge

@@ -0,0 +1,5 @@
+NODE_ENV=production
+
+VITE_ENV=edge
+VITE_EXTENSION_ID=lignnlhlpiefmcjkdkmfjdckhlaiajan
+VITE_REVIEW_URL=https://microsoftedge.microsoft.com/addons/detail/lignnlhlpiefmcjkdkmfjdckhlaiajan

README.md

@@ -27,6 +27,13 @@
 
 安装扩展后，在哔哩哔哩网站观看视频时，视频右侧会显示字幕列表面板。
 
+### 使用本地Ollama模型
+如果你使用本地Ollama模型，需要配置环境变量：`OLLAMA_ORIGINS=chrome-extension://bciglihaegkdhoogebcdblfhppoilclp`，否则访问会出现403错误。
+
+然后在插件配置里，apiKey随便填一个，服务器地址填`http://localhost:11434`，模型选自定义，然后填入自定义模型名如`llama2`。
+
+但是测试发现llama2 7b模型比较弱，无法返回需要的json格式，因此总结很可能会无法解析响应而报错(但提问功能不需要解析响应格式，因此没问题)。
+
 ## 交流联系
 
 QQ群：194536885

manifest.json

@@ -1,11 +1,15 @@
 {
   "name": "哔哩哔哩字幕列表",
   "description": "显示B站视频的字幕列表,可点击跳转与下载字幕,并支持翻译和总结字幕!",
-  "version": "1.7.7",
+  "version": "1.10.4",
   "manifest_version": 3,
   "permissions": [
     "storage"
   ],
+  "host_permissions": [
+    "http://localhost/*",
+    "http://127.0.0.1/*"
+  ],
   "background": {
     "service_worker": "src/chrome/background.ts"
   },

package.json

@@ -1,15 +1,15 @@
 {
   "private": true,
   "name": "bilibili-subtitle",
-  "version": "1.7.7",
+  "version": "1.10.4",
   "type": "module",
   "description": "哔哩哔哩字幕列表",
   "main": "index.js",
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build -m production_chrome",
+    "build_chrome": "tsc && vite build -m production_chrome && node fixChrome.cjs",
-    "build_chrome": "pnpm run build && node fixChrome.cjs",
+    "build_edge": "tsc && vite build -m production_edge && node fixChrome.cjs",
-    "build_firefox": "pnpm run build && node fixFirefox.cjs",
+    "build_firefox": "tsc && vite build -m production_chrome && node fixFirefox.cjs",
     "fix": "eslint --fix --quiet ."
   },
   "author": "IndieKKY",

src/biz/Ask.tsx

@@ -0,0 +1,72 @@
+import {AiOutlineCloseCircle, BsDashSquare, BsPlusSquare, FaQuestion} from 'react-icons/all'
+import classNames from 'classnames'
+import Markdown from '../components/Markdown'
+import React, {useCallback} from 'react'
+import {delAskInfo, mergeAskInfo, setPage} from '../redux/envReducer'
+import {useAppDispatch, useAppSelector} from '../hooks/redux'
+import {PAGE_SETTINGS} from '../const'
+import toast from 'react-hot-toast'
+import useTranslate from '../hooks/useTranslate'
+
+const Ask = (props: {
+  ask: AskInfo
+}) => {
+  const {ask} = props
+  const dispatch = useAppDispatch()
+  const envData = useAppSelector(state => state.env.envData)
+  const fontSize = useAppSelector(state => state.env.envData.fontSize)
+  const segments = useAppSelector(state => state.env.segments)
+  const {addAskTask} = useTranslate()
+
+  const onRegenerate = useCallback(() => {
+    const apiKey = envData.aiType === 'gemini'?envData.geminiApiKey:envData.apiKey
+    if (apiKey) {
+      if (segments != null && segments.length > 0) {
+        addAskTask(ask.id, segments[0], ask.question).catch(console.error)
+      }
+    } else {
+      dispatch(setPage(PAGE_SETTINGS))
+      toast.error('需要先设置ApiKey!')
+    }
+  }, [addAskTask, ask.id, ask.question, dispatch, envData.aiType, envData.apiKey, envData.geminiApiKey, segments])
+
+  const onAskFold = useCallback(() => {
+    dispatch(mergeAskInfo({
+      id: ask.id,
+      fold: !ask.fold
+    }))
+  }, [ask, dispatch])
+
+  const onClose = useCallback(() => {
+    dispatch(delAskInfo(ask.id))
+  }, [ask, dispatch])
+
+  return <div className='shadow bg-base-200 my-0.5 mx-1.5 p-1.5 rounded flex flex-col justify-center items-center'>
+    <div className='w-full relative flex justify-center min-h-[20px]'>
+      <div className='absolute left-0 top-0 bottom-0 text-xs select-none flex-center desc'>
+        {ask.fold
+          ? <BsPlusSquare className='cursor-pointer' onClick={onAskFold}/> :
+          <BsDashSquare className='cursor-pointer' onClick={onAskFold}/>}
+      </div>
+      <button className='absolute right-0 top-0 bottom-0 btn btn-ghost btn-xs btn-circle text-base-content/75' onClick={onClose}>
+        <AiOutlineCloseCircle/>
+      </button>
+      <div className="tabs">
+        <a className="tab tab-lifted tab-xs tab-disabled cursor-default"></a>
+        <a className='tab tab-lifted tab-xs tab-active'><FaQuestion/>提问</a>
+        <a className="tab tab-lifted tab-xs tab-disabled cursor-default"></a>
+      </div>
+    </div>
+    {!ask.fold && ask.question && <div className='text-sm font-medium max-w-[90%]'>{ask.question}</div>}
+    {!ask.fold && ask.content &&
+      <div className={classNames('font-medium max-w-[90%] mt-1', fontSize === 'large' ? 'text-sm' : 'text-xs')}>
+        <Markdown content={ask.content}/>
+      </div>}
+    {!ask.fold && <button disabled={ask.status !== 'done'}
+                         className={classNames('btn btn-link btn-xs', ask.status === 'pending' && 'loading')}
+                         onClick={onRegenerate}>{ask.status === 'pending' ? '生成中' : '重新生成'}</button>}
+    {!ask.fold && ask.error && <div className='text-xs text-error'>{ask.error}</div>}
+  </div>
+}
+
+export default Ask

src/biz/Body.tsx

@@ -1,14 +1,16 @@
-import React, {useCallback, useEffect, useRef} from 'react'
+import React, {useCallback, useEffect, useMemo, useRef} from 'react'
 import {
+  addAskInfo,
+  mergeAskInfo,
   setAutoScroll,
   setAutoTranslate,
   setCheckAutoScroll,
-  setCompact,
   setFoldAll,
   setNeedScroll,
   setPage,
   setSearchText,
-  setSegmentFold
+  setSegmentFold,
+  setTempData
 } from '../redux/envReducer'
 import {useAppDispatch, useAppSelector} from '../hooks/redux'
 import {
@@ -17,54 +19,82 @@ import {
   FaRegArrowAltCircleDown,
   IoWarning,
   MdExpand,
-  RiFileCopy2Line,
   RiTranslate
 } from 'react-icons/all'
 import classNames from 'classnames'
 import toast from 'react-hot-toast'
 import SegmentCard from './SegmentCard'
 import {
+  ASK_ENABLED_DEFAULT,
   HEADER_HEIGHT,
   PAGE_SETTINGS,
   SEARCH_BAR_HEIGHT,
   SUMMARIZE_ALL_THRESHOLD,
-  SUMMARIZE_TYPES,
   TITLE_HEIGHT
 } from '../const'
 import {FaClipboardList} from 'react-icons/fa'
 import useTranslate from '../hooks/useTranslate'
-import {getSummarize} from '../util/biz_util'
 import {openUrl} from '@kky002/kky-util'
+import useKeyService from '../hooks/useKeyService'
+import Ask from './Ask'
+import {v4} from 'uuid'
+import RateExtension from '../components/RateExtension'
 
 const Body = () => {
   const dispatch = useAppDispatch()
+  const inputting = useAppSelector(state => state.env.inputting)
   const noVideo = useAppSelector(state => state.env.noVideo)
   const autoTranslate = useAppSelector(state => state.env.autoTranslate)
   const autoScroll = useAppSelector(state => state.env.autoScroll)
   const segments = useAppSelector(state => state.env.segments)
   const foldAll = useAppSelector(state => state.env.foldAll)
   const envData = useAppSelector(state => state.env.envData)
-  const compact = useAppSelector(state => state.env.compact)
+  const compact = useAppSelector(state => state.env.tempData.compact)
-  const apiKey = useAppSelector(state => state.env.envData.apiKey)
   const floatKeyPointsSegIdx = useAppSelector(state => state.env.floatKeyPointsSegIdx)
   const translateEnable = useAppSelector(state => state.env.envData.translateEnable)
   const summarizeEnable = useAppSelector(state => state.env.envData.summarizeEnable)
-  const {addSummarizeTask} = useTranslate()
+  const {addSummarizeTask, addAskTask} = useTranslate()
+  // const infos = useAppSelector(state => state.env.infos)
   const bodyRef = useRef<any>()
   const curOffsetTop = useAppSelector(state => state.env.curOffsetTop)
   const checkAutoScroll = useAppSelector(state => state.env.checkAutoScroll)
   const needScroll = useAppSelector(state => state.env.needScroll)
   const totalHeight = useAppSelector(state => state.env.totalHeight)
   const curSummaryType = useAppSelector(state => state.env.tempData.curSummaryType)
-  const title = useAppSelector(state => state.env.title)
+  // const title = useAppSelector(state => state.env.title)
+  // const fontSize = useAppSelector(state => state.env.envData.fontSize)
   const searchText = useAppSelector(state => state.env.searchText)
+  const asks = useAppSelector(state => state.env.asks)
+  // const recommendIdx = useMemo(() => random(0, 3), [])
+  const showSearchInput = useMemo(() => {
+    return (segments != null && segments.length > 0) && (envData.searchEnabled ? envData.searchEnabled : (envData.askEnabled ?? ASK_ENABLED_DEFAULT))
+  }, [envData.askEnabled, envData.searchEnabled, segments])
+  const searchPlaceholder = useMemo(() => {
+    let placeholder = ''
+    if (envData.searchEnabled) {
+      if (envData.askEnabled??ASK_ENABLED_DEFAULT) {
+        placeholder = '搜索或提问字幕内容(按Enter提问)'
+      } else {
+        placeholder = '搜索字幕内容'
+      }
+    } else {
+      if (envData.askEnabled??ASK_ENABLED_DEFAULT) {
+        placeholder = '提问字幕内容'
+      }
+    }
+    return placeholder
+  }, [envData.askEnabled, envData.searchEnabled])
 
   const normalCallback = useCallback(() => {
-    dispatch(setCompact(false))
+    dispatch(setTempData({
+      compact: false
+    }))
   }, [dispatch])
 
   const compactCallback = useCallback(() => {
-    dispatch(setCompact(true))
+    dispatch(setTempData({
+      compact: true
+    }))
   }, [dispatch])
 
   const posCallback = useCallback(() => {
@@ -72,6 +102,7 @@ const Body = () => {
   }, [dispatch])
 
   const onSummarizeAll = useCallback(() => {
+    const apiKey = envData.aiType === 'gemini'?envData.geminiApiKey:envData.apiKey
     if (!apiKey) {
       dispatch(setPage(PAGE_SETTINGS))
       toast.error('需要先设置ApiKey!')
@@ -94,26 +125,33 @@ const Body = () => {
       }
       toast.success(`已添加${segments_.length}个总结任务!`)
     }
-  }, [addSummarizeTask, apiKey, curSummaryType, dispatch, segments])
+  }, [addSummarizeTask, curSummaryType, dispatch, envData.aiType, envData.apiKey, envData.geminiApiKey, segments])
 
   const onFoldAll = useCallback(() => {
     dispatch(setFoldAll(!foldAll))
+    for (const ask of asks) {
+      dispatch(mergeAskInfo({
+        id: ask.id,
+        fold: !foldAll
+      }))
+    }
     for (const segment of segments ?? []) {
       dispatch(setSegmentFold({
         segmentStartIdx: segment.startIdx,
         fold: !foldAll
       }))
     }
-  }, [dispatch, foldAll, segments])
+  }, [asks, dispatch, foldAll, segments])
 
   const toggleAutoTranslateCallback = useCallback(() => {
-    if (envData.apiKey) {
+    const apiKey = envData.aiType === 'gemini'?envData.geminiApiKey:envData.apiKey
+    if (apiKey) {
       dispatch(setAutoTranslate(!autoTranslate))
     } else {
       dispatch(setPage(PAGE_SETTINGS))
       toast.error('需要先设置ApiKey!')
     }
-  }, [autoTranslate, dispatch, envData.apiKey])
+  }, [autoTranslate, dispatch, envData.aiType, envData.apiKey, envData.geminiApiKey])
 
   const onEnableAutoScroll = useCallback(() => {
     dispatch(setAutoScroll(true))
@@ -126,14 +164,14 @@ const Body = () => {
     }
   }, [autoScroll, dispatch])
 
-  const onCopy = useCallback(() => {
+  // const onCopy = useCallback(() => {
-    const [success, content] = getSummarize(title, segments, curSummaryType)
+  //   const [success, content] = getSummarize(title, segments, curSummaryType)
-    if (success) {
+  //   if (success) {
-      navigator.clipboard.writeText(content).then(() => {
+  //     navigator.clipboard.writeText(content).then(() => {
-        toast.success('复制成功')
+  //       toast.success('复制成功')
-      }).catch(console.error)
+  //     }).catch(console.error)
-    }
+  //   }
-  }, [curSummaryType, segments, title])
+  // }, [curSummaryType, segments, title])
 
   const onSearchTextChange = useCallback((e: any) => {
     const searchText = e.target.value
@@ -144,10 +182,34 @@ const Body = () => {
     dispatch(setSearchText(''))
   }, [dispatch])
 
+  const onAsk = useCallback(() => {
+    if ((envData.askEnabled??ASK_ENABLED_DEFAULT) && searchText) {
+      const apiKey = envData.aiType === 'gemini'?envData.geminiApiKey:envData.apiKey
+      if (apiKey) {
+        if (segments != null && segments.length > 0) {
+          const id = v4()
+          addAskTask(id, segments[0], searchText).catch(console.error)
+          // 添加ask
+          dispatch(addAskInfo({
+            id,
+            question: searchText,
+            status: 'pending',
+          }))
+        }
+      } else {
+        dispatch(setPage(PAGE_SETTINGS))
+        toast.error('需要先设置ApiKey!')
+      }
+    }
+  }, [addAskTask, dispatch, envData.aiType, envData.apiKey, envData.askEnabled, envData.geminiApiKey, searchText, segments])
+
+  // service
+  useKeyService()
+
   // 自动滚动
   useEffect(() => {
     if (checkAutoScroll && curOffsetTop && autoScroll && !needScroll) {
-      if (bodyRef.current.scrollTop <= curOffsetTop - bodyRef.current.offsetTop - (totalHeight-120) + (floatKeyPointsSegIdx != null ? 100 : 0) ||
+      if (bodyRef.current.scrollTop <= curOffsetTop - bodyRef.current.offsetTop - (totalHeight-160) + (floatKeyPointsSegIdx != null ? 100 : 0) ||
         bodyRef.current.scrollTop >= curOffsetTop - bodyRef.current.offsetTop - 40 - 10
       ) {
         dispatch(setNeedScroll(true))
@@ -188,8 +250,18 @@ const Body = () => {
     </div>
 
     {/* search */}
-    {envData.searchEnabled && <div className='px-2 py-1 flex flex-col relative'>
+    {showSearchInput && <div className='px-2 py-1 flex flex-col relative'>
-      <input type='text' className='input input-xs bg-base-200' placeholder='搜索字幕内容' value={searchText} onChange={onSearchTextChange}/>
+      <input type='text' className='input input-xs bg-base-200' placeholder={searchPlaceholder} value={searchText} onChange={onSearchTextChange} onKeyDown={e => {
+        // enter
+        if (e.key === 'Enter') {
+          if (!inputting) {
+            e.preventDefault()
+            e.stopPropagation()
+            onAsk()
+            dispatch(setSearchText(''))
+          }
+        }
+      }}/>
       {searchText && <button className='absolute top-1 right-2 btn btn-ghost btn-xs btn-circle text-base-content/75' onClick={onClearSearchText}><AiOutlineCloseCircle/></button>}
     </div>}
 
@@ -205,32 +277,142 @@ const Body = () => {
     <div ref={bodyRef} onWheel={onWheel}
          className={classNames('flex flex-col gap-1.5 overflow-y-auto select-text scroll-smooth', floatKeyPointsSegIdx != null && 'pb-[100px]')}
          style={{
-           height: `${totalHeight - HEADER_HEIGHT - TITLE_HEIGHT - (envData.searchEnabled?SEARCH_BAR_HEIGHT:0)}px`
+           height: `${totalHeight - HEADER_HEIGHT - TITLE_HEIGHT - (showSearchInput ? SEARCH_BAR_HEIGHT : 0)}px`
          }}
     >
-      {segments?.map((segment, segmentIdx) => <SegmentCard key={segment.startIdx} segment={segment} segmentIdx={segmentIdx} bodyRef={bodyRef}/>)}
+      {/* asks */}
+      {asks.map(ask => <Ask key={ask.id} ask={ask}/>)}
+
+      {/* segments */}
+      {segments?.map((segment, segmentIdx) => <SegmentCard key={segment.startIdx} segment={segment}
+                                                           segmentIdx={segmentIdx} bodyRef={bodyRef}/>)}
 
       {/* tip */}
-      <div className='flex flex-col items-center text-center pt-1 pb-2'>
+      <div className='text-sm font-semibold text-center'>快捷键提示</div>
-        <div className='font-semibold text-accent'>💡<span className='underline underline-offset-4'>提示</span>💡</div>
+      <ul className='list-disc text-sm desc pl-5'>
-        <div className='text-sm desc px-2'>可以尝试将<span className='text-amber-600 font-semibold'>概览</span>生成的内容粘贴到<span className='text-secondary/75 font-semibold'>视频评论</span>里，发布后看看有什么效果🥳</div>
+        <li>单击字幕跳转，双击字幕跳转+切换暂停。</li>
-        {(segments?.length??0) > 0 && <button className='mt-1.5 btn btn-xs btn-info' onClick={onCopy}>点击复制生成的{SUMMARIZE_TYPES[curSummaryType].name}<RiFileCopy2Line/></button>}
+        <li>alt+单击字幕复制单条字幕。</li>
-      </div>
+        <li>上下方向键来移动当前字幕(可先点击字幕使焦点在字幕列表内)。</li>
-      <div className='flex flex-col items-center text-center py-2 mx-4 border-t border-t-base-300'>
+      </ul>
-        <div className='font-semibold text-accent flex items-center gap-1'><img src='/youtube-subtitle.png' alt='youtube subtitle' className='w-8 h-8'/>Youtube Subtitle</div>
+
-        <div className='text-sm px-2 desc'>这是<span className='text-amber-600 font-semibold text-base'>Youtube</span>版的字幕列表</div>
+      {/* <div className='flex flex-col items-center text-center pt-1 pb-2'> */}
-        <div className='flex gap-2'>
+      {/*  <div className='font-semibold text-accent'>💡<span className='underline underline-offset-4'>提示</span>💡</div> */}
-          <a title='Chrome商店' href='https://chromewebstore.google.com/detail/fiaeclpicddpifeflpmlgmbjgaedladf' onClick={(e) => {
+      {/*  <div className='text-sm desc px-2'>可以尝试将<span className='text-amber-600 font-semibold'>概览</span>生成的内容粘贴到<span */}
-            e.preventDefault()
+      {/*    className='text-secondary/75 font-semibold'>视频评论</span>里，发布后看看有什么效果🥳 */}
-            openUrl('https://chromewebstore.google.com/detail/fiaeclpicddpifeflpmlgmbjgaedladf')
+      {/*  </div> */}
-          }} className='link text-sm text-accent'>Chrome商店</a>
+      {/*  {(segments?.length ?? 0) > 0 && <button className='mt-1.5 btn btn-xs btn-info' */}
-          <a title='Edge商店' href='https://microsoftedge.microsoft.com/addons/detail/galeejdehabppfgooagmkclpppnbccpc' onClick={e => {
+      {/*                                          onClick={onCopy}>点击复制生成的{SUMMARIZE_TYPES[curSummaryType].name}<RiFileCopy2Line/> */}
-            e.preventDefault()
+      {/*  </button>} */}
-            openUrl('https://microsoftedge.microsoft.com/addons/detail/galeejdehabppfgooagmkclpppnbccpc')
+      {/* </div> */}
-          }} className='link text-sm text-accent'>Edge商店</a>
+      <div className='flex flex-col'>
+        {/* <div className='flex flex-col items-center text-center py-2 mx-4 border-t border-t-base-300'> */}
+        {/*  <div className='font-semibold text-accent flex items-center gap-1'><img src='/bibigpt.png' */}
+        {/*                                                                          alt='BibiGPT logo' */}
+        {/*                                                                          className='w-8 h-8'/>BibiGPT */}
+        {/*  </div> */}
+        {/*  <div className='text-sm px-2 desc'>这是<span className='text-amber-600 font-semibold text-base'>网页</span>版的字幕列表，支持<span */}
+        {/*    className='font-semibold'>任意</span>视频提取字幕总结（包括没有字幕的视频） */}
+        {/*  </div> */}
+        {/*  <div className='flex gap-2'> */}
+        {/*    <a title='BibiGPT' href='https://bibigpt.co/r/bilibili' */}
+        {/*       onClick={(e) => { */}
+        {/*         e.preventDefault() */}
+        {/*         openUrl('https://bibigpt.co/r/bilibili') */}
+        {/*       }} className='link text-sm text-accent'>✨ BibiGPT ✨</a> */}
+        {/*  </div> */}
+        {/* </div> */}
+        <div className='flex flex-col items-center text-center py-2 mx-4 border-t border-t-base-300'>
+          <div className='font-semibold text-accent flex items-center gap-1'><img src='/youtube-caption.png'
+                                                                                  alt='youtube caption logo'
+                                                                                  className='w-8 h-8'/>YouTube Caption
+          </div>
+          <div className='text-sm px-2 desc'>这是<span className='text-amber-600 font-semibold text-base'>YouTube</span>版的字幕列表
+          </div>
+          <div className='flex gap-2'>
+            <a title='Chrome商店' href='https://chromewebstore.google.com/detail/fiaeclpicddpifeflpmlgmbjgaedladf'
+               onClick={(e) => {
+                 e.preventDefault()
+                 openUrl('https://chromewebstore.google.com/detail/fiaeclpicddpifeflpmlgmbjgaedladf')
+               }} className='link text-sm text-accent'>Chrome商店</a>
+            <a title='Edge商店'
+               href='https://microsoftedge.microsoft.com/addons/detail/galeejdehabppfgooagmkclpppnbccpc'
+               onClick={e => {
+                 e.preventDefault()
+                 openUrl('https://microsoftedge.microsoft.com/addons/detail/galeejdehabppfgooagmkclpppnbccpc')
+               }} className='link text-sm text-accent'>Edge商店</a>
+            <a title='Crx搜搜(国内可访问)'
+               href='https://www.crxsoso.com/webstore/detail/fiaeclpicddpifeflpmlgmbjgaedladf'
+               onClick={(e) => {
+                 e.preventDefault()
+                 openUrl('https://www.crxsoso.com/webstore/detail/fiaeclpicddpifeflpmlgmbjgaedladf')
+               }} className='link text-sm text-accent'>Crx搜搜(国内可访问)</a>
+          </div>
         </div>
+        {/* <div className='flex flex-col items-center text-center py-2 mx-4 border-t border-t-base-300'> */}
+        {/*  <div className='font-semibold text-accent flex items-center gap-1'><img src='/my-article-summarizer.png' */}
+        {/*                                                                          alt='My Article Summarizer logo' */}
+        {/*                                                                          className='w-8 h-8'/>My Article Summarizer */}
+        {/*  </div> */}
+        {/*  <div className='text-sm px-2 desc'>网页文章总结（有每日免费额度，无需apikey）。</div> */}
+        {/*  <div className='flex gap-2'> */}
+        {/*    <a title='Chrome商店' href='https://chromewebstore.google.com/detail/my-article-summarizer/nanlpakfialleijdidafldapoifndngn' */}
+        {/*       onClick={(e) => { */}
+        {/*         e.preventDefault() */}
+        {/*         openUrl('https://chromewebstore.google.com/detail/my-article-summarizer/nanlpakfialleijdidafldapoifndngn') */}
+        {/*       }} className='link text-sm text-accent'>Chrome商店</a> */}
+        {/*    <a title='Crx搜搜(国内可访问)' */}
+        {/*       href='https://www.crxsoso.com/webstore/detail/nanlpakfialleijdidafldapoifndngn' */}
+        {/*       onClick={(e) => { */}
+        {/*         e.preventDefault() */}
+        {/*         openUrl('https://www.crxsoso.com/webstore/detail/nanlpakfialleijdidafldapoifndngn') */}
+        {/*       }} className='link text-sm text-accent'>Crx搜搜(国内可访问)</a> */}
+        {/*  </div> */}
+        {/* </div> */}
       </div>
+      <div className='p-2'><RateExtension/></div>
     </div>
+    {/* recommend */}
+    {/* <div className='p-0.5' style={{ */}
+    {/*  height: `${RECOMMEND_HEIGHT}px` */}
+    {/* }}> */}
+    {/*  {recommendIdx === 0 && <div className='flex items-center gap-1.5 rounded shadow-sm bg-base-200/10'> */}
+    {/*    <a className='link link-accent link-hover font-semibold text-sm flex items-center' onClick={(e) => { */}
+    {/*      e.preventDefault() */}
+    {/*      openUrl('https://bibigpt.co/r/bilibili') */}
+    {/*    }}><img src='/bibigpt.png' */}
+    {/*            alt='BibiGPT logo' */}
+    {/*            className='w-8 h-8'/>✨ BibiGPT ✨</a> */}
+    {/*    <span className='text-sm desc'>支持任意视频的网页版总结。</span> */}
+    {/*  </div>} */}
+    {/*  {recommendIdx === 1 && <div className='flex items-center gap-1 rounded shadow-sm bg-base-200/10'> */}
+    {/*    <a className='link link-accent link-hover font-semibold text-sm flex items-center' onClick={(e) => { */}
+    {/*      e.preventDefault() */}
+    {/*      openUrl('https://chromewebstore.google.com/detail/fiaeclpicddpifeflpmlgmbjgaedladf') */}
+    {/*    }}><img src='/youtube-caption.png' */}
+    {/*            alt='youtube caption logo' */}
+    {/*            className='w-8 h-8'/>YouTube Caption</a> */}
+    {/*    <span className='text-sm desc'>YouTube版的字幕列表。</span> */}
+    {/*  </div>} */}
+    {/*  {recommendIdx === 2 && <div className='flex items-center gap-1 rounded shadow-sm bg-base-200/10'> */}
+    {/*    <a className='link link-accent link-hover font-semibold text-sm flex items-center' onClick={(e) => { */}
+    {/*      e.preventDefault() */}
+    {/*      openUrl('https://chromewebstore.google.com/detail/nanlpakfialleijdidafldapoifndngn') */}
+    {/*    }}><img src='/my-article-summarizer.png' */}
+    {/*            alt='My Article Summarizer logo' */}
+    {/*            className='w-8 h-8'/>My Article Summarizer</a> */}
+    {/*    <span className='text-sm desc'>网页文章总结。</span> */}
+    {/*  </div>} */}
+    {/*  {recommendIdx === 3 && <div className='flex items-center gap-1 rounded shadow-sm bg-base-200/10'> */}
+    {/*    <a className='link link-accent link-hover font-semibold text-sm flex items-center' onClick={(e) => { */}
+    {/*      e.preventDefault() */}
+    {/*      openUrl('https://api.openai-up.com/register?aff=varM') */}
+    {/*    }}><img src='/openai-up.ico' */}
+    {/*            alt='Openai Up logo' */}
+    {/*            className='w-8 h-8'/>Openai代理</a> */}
+    {/*    <span className='text-sm desc flex items-center'>目前价格不到官方的6折<FaGripfire */}
+    {/*      className='text-amber-600'/></span> */}
+    {/*  </div>} */}
+    {/* </div> */}
   </div>
 }
 

src/biz/CompactSegmentItem.tsx

@@ -9,8 +9,9 @@ const CompactSegmentItem = (props: {
   isIn: boolean
   last: boolean
   moveCallback: (event: any) => void
+  move2Callback: (event: any) => void
 }) => {
-  const {item, idx, last, isIn, moveCallback} = props
+  const {item, idx, last, isIn, moveCallback, move2Callback} = props
   const transResult = useAppSelector(state => state.env.transResults[idx])
   const envData = useAppSelector(state => state.env.envData)
   const fontSize = useAppSelector(state => state.env.envData.fontSize)
@@ -19,10 +20,10 @@ const CompactSegmentItem = (props: {
   const display = useMemo(() => getDisplay(envData.transDisplay, item.content, transText), [envData.transDisplay, item.content, transText])
 
   return <div className={classNames('inline', fontSize === 'large'?'text-sm':'text-xs')}>
-    <span className={'pl-1 pr-0.5 py-0.5 cursor-pointer rounded-sm hover:bg-base-200'} onClick={moveCallback}>
+    <span className={'pl-1 pr-0.5 py-0.5 cursor-pointer rounded-sm hover:bg-base-200'} onClick={moveCallback} onDoubleClick={move2Callback}>
       <text className={classNames('font-medium', isIn ? 'text-primary underline' : '')}>{display.main}</text>
       {display.sub && <text className='desc'>({display.sub})</text>}</span>
-    <span>{!last && ' '}</span>
+    <span className='text-base-content/75'>{!last && ','}</span>
   </div>
 }
 

src/biz/MoreBtn.tsx

@@ -11,7 +11,7 @@ import {
 import Popover from '../components/Popover'
 import {Placement} from '@popperjs/core/lib/enums'
 import {useAppDispatch, useAppSelector} from '../hooks/redux'
-import {setDownloadType, setEnvData, setPage} from '../redux/envReducer'
+import {setEnvData, setPage, setTempData} from '../redux/envReducer'
 import {EventBusContext} from '../Router'
 import {EVENT_EXPAND, PAGE_SETTINGS} from '../const'
 import {formatSrtTime, formatTime, formatVttTime} from '../util/util'
@@ -62,10 +62,11 @@ const MoreBtn = (props: Props) => {
   const data = useAppSelector(state => state.env.data)
   const envReady = useAppSelector(state => state.env.envReady)
   const envData = useAppSelector(state => state.env.envData)
-  const downloadType = useAppSelector(state => state.env.downloadType)
+  const downloadType = useAppSelector(state => state.env.tempData.downloadType)
   const [moreVisible, setMoreVisible] = useState(false)
   const eventBus = useContext(EventBusContext)
   const segments = useAppSelector(state => state.env.segments)
+  const url = useAppSelector(state => state.env.url)
   const title = useAppSelector(state => state.env.title)
   const curSummaryType = useAppSelector(state => state.env.tempData.curSummaryType)
 
@@ -74,26 +75,27 @@ const MoreBtn = (props: Props) => {
       return
     }
 
-    let s, fileName
+    let fileName = title
+    let s, suffix
     if (!downloadType || downloadType === 'text') {
-      s = ''
+      s = `${title??'无标题'}\n${url??'无链接'}\n\n`
       for (const item of data.body) {
         s += item.content + '\n'
       }
-      fileName = 'download.txt'
+      suffix = 'txt'
     } else if (downloadType === 'textWithTime') {
-      s = ''
+      s = `${title??'无标题'}\n${url??'无链接'}\n\n`
       for (const item of data.body) {
         s += formatTime(item.from) + ' ' + item.content + '\n'
       }
-      fileName = 'download.txt'
+      suffix = 'txt'
     } else if (downloadType === 'article') {
-      s = ''
+      s = `${title??'无标题'}\n${url??'无链接'}\n\n`
       for (const item of data.body) {
         s += item.content + ', '
       }
       s = s.substring(0, s.length - 1) // remove last ','
-      fileName = 'download.txt'
+      suffix = 'txt'
     } else if (downloadType === 'srt') {
       /**
        * 1
@@ -112,7 +114,7 @@ const MoreBtn = (props: Props) => {
         s += ss
       }
       s = s.substring(0, s.length - 1)// remove last '\n'
-      fileName = 'download.srt'
+      suffix = 'srt'
     } else if (downloadType === 'vtt') {
       /**
        * WEBVTT title
@@ -133,27 +135,29 @@ const MoreBtn = (props: Props) => {
         s += ss
       }
       s = s.substring(0, s.length - 1)// remove last '\n'
-      fileName = 'download.vtt'
+      suffix = 'vtt'
     } else if (downloadType === 'json') {
       s = JSON.stringify(data)
-      fileName = 'download.json'
+      suffix = 'json'
     } else if (downloadType === 'summarize') {
+      s = `${title??'无标题'}\n${url??'无链接'}\n\n`
       const [success, content] = getSummarize(title, segments, curSummaryType)
       if (!success) return
-      s = content
+      s += content
-      fileName = '总结.txt'
+      fileName += ' - 总结'
+      suffix = 'txt'
     } else {
       return
     }
     if (download) {
-      downloadText(s, fileName)
+      downloadText(s, fileName+'.'+suffix)
     } else {
       navigator.clipboard.writeText(s).then(() => {
         toast.success('复制成功')
       }).catch(console.error)
     }
     setMoreVisible(false)
-  }, [curSummaryType, data, downloadType, segments, title])
+  }, [curSummaryType, data, downloadType, segments, title, url])
 
   const downloadAudioCallback = useCallback(() => {
     window.parent.postMessage({
@@ -162,7 +166,9 @@ const MoreBtn = (props: Props) => {
   }, [])
 
   const selectCallback = useCallback((e: any) => {
-    dispatch(setDownloadType(e.target.value))
+    dispatch(setTempData({
+      downloadType: e.target.value,
+    }))
   }, [dispatch])
 
   const preventCallback = useCallback((e: any) => {
@@ -259,16 +265,27 @@ const MoreBtn = (props: Props) => {
             微信公众号(IndieKKY)
           </a>
         </li>
-        <li className='hover:bg-accent'>
+        {/* <li className='hover:bg-accent'> */}
-          <a className='flex items-center' onClick={(e) => {
+        {/*  <a className='flex items-center' onClick={(e) => { */}
-            e.preventDefault()
+        {/*    e.preventDefault() */}
-            e.stopPropagation()
+        {/*    e.stopPropagation() */}
-            openUrl('https://chromewebstore.google.com/detail/fiaeclpicddpifeflpmlgmbjgaedladf')
+        {/*    openUrl('https://bibigpt.co/r/bilibili') */}
-          }}>
+        {/*  }}> */}
-            <img alt='youtube subtitle' src='/youtube-subtitle.png' className='w-[20px] h-[20px] bg-white rounded-sm p-0.5'/>
+        {/*    <img alt='BibiGPT' src='/bibigpt.png' className='w-[20px] h-[20px] bg-white rounded-sm p-0.5'/> */}
-            Youtube Subtitle
+        {/*    BibiGPT */}
-          </a>
+        {/*  </a> */}
-        </li>
+        {/* </li> */}
+        {/* <li className='hover:bg-accent'> */}
+        {/*  <a className='flex items-center' onClick={(e) => { */}
+        {/*    e.preventDefault() */}
+        {/*    e.stopPropagation() */}
+        {/*    openUrl('https://chromewebstore.google.com/detail/fiaeclpicddpifeflpmlgmbjgaedladf') */}
+        {/*  }}> */}
+        {/*    <img alt='youtube subtitle' src='/youtube-caption.png' */}
+        {/*         className='w-[20px] h-[20px] bg-white rounded-sm p-0.5'/> */}
+        {/*    Youtube Caption */}
+        {/*  </a> */}
+        {/* </li> */}
         <li className='hover:bg-accent'>
           <a className='flex items-center' onClick={(e) => {
             dispatch(setPage(PAGE_SETTINGS))
@@ -282,7 +299,7 @@ const MoreBtn = (props: Props) => {
         </li>
       </ul>
     </Popover>}
-</>
+  </>
 }
 
 export default MoreBtn

src/biz/NormalSegmentItem.tsx

@@ -9,8 +9,9 @@ const NormalSegmentItem = (props: {
   idx: number
   isIn: boolean
   moveCallback: (event: any) => void
+  move2Callback: (event: any) => void
 }) => {
-  const {item, idx, isIn, moveCallback} = props
+  const {item, idx, isIn, moveCallback, move2Callback} = props
   const transResult = useAppSelector(state => state.env.transResults[idx])
   const envData = useAppSelector(state => state.env.envData)
   const fontSize = useAppSelector(state => state.env.envData.fontSize)
@@ -19,7 +20,7 @@ const NormalSegmentItem = (props: {
   const display = useMemo(() => getDisplay(envData.transDisplay, item.content, transText), [envData.transDisplay, item.content, transText])
 
   return <div className={classNames('flex py-0.5 cursor-pointer rounded-sm hover:bg-base-200', fontSize === 'large'?'text-sm':'text-xs')}
-              onClick={moveCallback}>
+              onClick={moveCallback} onDoubleClick={move2Callback}>
     <div className='desc w-[66px] flex justify-center'>{formatTime(item.from)}</div>
     <div className={'flex-1'}>
       <div className={classNames('font-medium', isIn ? 'text-primary underline' : '')}>{display.main}</div>

src/biz/SegmentCard.tsx

@@ -5,7 +5,7 @@ import classNames from 'classnames'
 import {FaClipboardList} from 'react-icons/fa'
 import {PAGE_MAIN, PAGE_SETTINGS, SUMMARIZE_THRESHOLD, SUMMARIZE_TYPES} from '../const'
 import useTranslate from '../hooks/useTranslate'
-import {BsDashSquare, BsPlusSquare, CgFileDocument, GrOverview, RiFileCopy2Line} from 'react-icons/all'
+import {BsDashSquare, BsPlusSquare, CgFileDocument, FaQuestion, GrOverview, RiFileCopy2Line} from 'react-icons/all'
 import toast from 'react-hot-toast'
 import {getLastTime, getSummaryStr, isSummaryEmpty, parseStrTimeToSeconds} from '../util/biz_util'
 import {useInViewport} from 'ahooks'
@@ -46,7 +46,7 @@ const SummarizeItemOverview = (props: {
     if (event.altKey) { // 复制
       navigator.clipboard.writeText(overviewItem.key).catch(console.error)
     } else {
-      move(time)
+      move(time, false)
     }
   }, [overviewItem.key, move, time])
 
@@ -66,19 +66,20 @@ const Summarize = (props: {
   const {segment, segmentIdx, summary, float} = props
 
   const dispatch = useAppDispatch()
-  const apiKey = useAppSelector(state => state.env.envData.apiKey)
+  const envData = useAppSelector(state => state.env.envData)
   const fontSize = useAppSelector(state => state.env.envData.fontSize)
   const curSummaryType = useAppSelector(state => state.env.tempData.curSummaryType)
   const {addSummarizeTask} = useTranslate()
 
   const onGenerate = useCallback(() => {
+    const apiKey = envData.aiType === 'gemini'?envData.geminiApiKey:envData.apiKey
     if (apiKey) {
       addSummarizeTask(curSummaryType, segment).catch(console.error)
     } else {
       dispatch(setPage(PAGE_SETTINGS))
       toast.error('需要先设置ApiKey!')
     }
-  }, [addSummarizeTask, apiKey, curSummaryType, dispatch, segment])
+  }, [addSummarizeTask, curSummaryType, dispatch, envData.aiType, envData.apiKey, envData.geminiApiKey, segment])
 
   const onCopy = useCallback(() => {
     if (summary != null) {
@@ -106,6 +107,13 @@ const Summarize = (props: {
         <div className={classNames('font-medium max-w-[90%]', fontSize === 'large' ? 'text-sm' : 'text-xs')}>
           {summary.content.summary}
         </div>}
+      {summary?.type === 'question' && (summary.content != null) &&
+        <div className={classNames('max-w-[90%] flex flex-col gap-1', fontSize === 'large' ? 'text-sm' : 'text-xs')}>
+          {summary.content.map((question: any, idx: number) => <div key={idx}>
+            <h2 className={classNames('font-semibold underline', fontSize === 'large' ? 'text-sm' : 'text-xs')}>{question.q}</h2>
+            <div className={classNames('font-normal', fontSize === 'large' ? 'text-sm' : 'text-xs')}>{question.a}</div>
+          </div>)}
+        </div>}
     </div>
     <div className='flex flex-col justify-center items-center'>
       {segment.text.length < SUMMARIZE_THRESHOLD && <div className='desc-lighter text-xs'>文字过短，无法总结.</div>}
@@ -138,7 +146,7 @@ const SegmentCard = (props: {
   const summarizeFloat = useAppSelector(state => state.env.envData.summarizeFloat)
   const fold = useAppSelector(state => state.env.fold)
   const page = useAppSelector(state => state.env.page)
-  const compact = useAppSelector(state => state.env.compact)
+  const compact = useAppSelector(state => state.env.tempData.compact)
   const floatKeyPointsSegIdx = useAppSelector(state => state.env.floatKeyPointsSegIdx)
   const showCurrent = useMemo(() => curIdx != null && segment.startIdx <= curIdx && curIdx <= segment.endIdx, [curIdx, segment.endIdx, segment.startIdx])
   const curSummaryType = useAppSelector(state => state.env.tempData.curSummaryType)
@@ -188,6 +196,12 @@ const SegmentCard = (props: {
     }))
   }, [dispatch])
 
+  const onSelQuestion = useCallback(() => {
+    dispatch(setTempData({
+      curSummaryType: 'question'
+    }))
+  }, [dispatch])
+
   return <div
     className={classNames('border border-base-300 bg-base-200/25 rounded flex flex-col m-1.5 p-1.5 gap-1 shadow', showCurrent && 'shadow-primary')}>
     <div className='relative flex justify-center min-h-[20px]'>
@@ -202,6 +216,7 @@ const SegmentCard = (props: {
         <a className={classNames('tab tab-lifted tab-xs', curSummaryType === 'brief' && 'tab-active')} onClick={onSelBrief}><CgFileDocument/>总结</a>
         <a className={classNames('tab tab-lifted tab-xs', curSummaryType === 'overview' && 'tab-active')} onClick={onSelOverview}><GrOverview/>概览</a>
         <a className={classNames('tab tab-lifted tab-xs', curSummaryType === 'keypoint' && 'tab-active')} onClick={onSelKeypoint}><FaClipboardList/>要点</a>
+        <a className={classNames('tab tab-lifted tab-xs', curSummaryType === 'question' && 'tab-active')} onClick={onSelQuestion}><FaQuestion/>问题</a>
         <a className="tab tab-lifted tab-xs tab-disabled cursor-default"></a>
       </div>}
       <div

src/biz/SegmentItem.tsx

@@ -18,7 +18,7 @@ const SegmentItem = (props: {
   const ref = useRef<any>()
   const {move} = useSubtitle()
 
-  const compact = useAppSelector(state => state.env.compact)
+  const compact = useAppSelector(state => state.env.tempData.compact)
   const searchText = useAppSelector(state => state.env.searchText)
   const searchResult = useAppSelector(state => state.env.searchResult)
   const display = useMemo(() => {
@@ -33,7 +33,15 @@ const SegmentItem = (props: {
     if (event.altKey) { // 复制
       navigator.clipboard.writeText(item.content).catch(console.error)
     } else {
-      move(item.from)
+      move(item.from, false)
+    }
+  }, [item.content, item.from, move])
+
+  const move2Callback = useCallback((event: any) => {
+    if (event.altKey) { // 复制
+      navigator.clipboard.writeText(item.content).catch(console.error)
+    } else {
+      move(item.from, true)
     }
   }, [item.content, item.from, move])
 
@@ -63,6 +71,7 @@ const SegmentItem = (props: {
         isIn={isIn}
         last={last}
         moveCallback={moveCallback}
+        move2Callback={move2Callback}
       />
       :
       <NormalSegmentItem
@@ -70,6 +79,7 @@ const SegmentItem = (props: {
         idx={idx}
         isIn={isIn}
         moveCallback={moveCallback}
+        move2Callback={move2Callback}
       />
     }
   </span>

src/biz/Settings.tsx

@@ -1,22 +1,27 @@
 import React, {PropsWithChildren, useCallback, useMemo, useState} from 'react'
-import {setEnvData, setPage} from '../redux/envReducer'
+import {setEnvData, setPage, setTempData} from '../redux/envReducer'
 import {useAppDispatch, useAppSelector} from '../hooks/redux'
 import {
+  ASK_ENABLED_DEFAULT,
+  CUSTOM_MODEL_TOKENS,
+  DEFAULT_SERVER_URL_OPENAI,
+  GEMINI_TOKENS,
   HEADER_HEIGHT,
   LANGUAGE_DEFAULT,
   LANGUAGES,
   MODEL_DEFAULT,
+  MODEL_MAP,
+  MODEL_TIP,
   MODELS,
   PAGE_MAIN,
   PROMPT_DEFAULTS,
   PROMPT_TYPES,
-  SERVER_URL_THIRD,
   SUMMARIZE_LANGUAGE_DEFAULT,
   TRANSLATE_FETCH_DEFAULT,
   TRANSLATE_FETCH_MAX,
   TRANSLATE_FETCH_MIN,
   TRANSLATE_FETCH_STEP,
-  WORDS_DEFAULT,
+  WORDS_RATE,
 } from '../const'
 import {IoWarning} from 'react-icons/all'
 import classNames from 'classnames'
@@ -59,18 +64,23 @@ const Settings = () => {
   const {value: translateEnableValue, onChange: setTranslateEnableValue} = useEventChecked(envData.translateEnable)
   const {value: summarizeEnableValue, onChange: setSummarizeEnableValue} = useEventChecked(envData.summarizeEnable)
   const {value: searchEnabledValue, onChange: setSearchEnabledValue} = useEventChecked(envData.searchEnabled)
+  const {value: askEnabledValue, onChange: setAskEnabledValue} = useEventChecked(envData.askEnabled??ASK_ENABLED_DEFAULT)
   const {value: cnSearchEnabledValue, onChange: setCnSearchEnabledValue} = useEventChecked(envData.cnSearchEnabled)
   const {value: summarizeFloatValue, onChange: setSummarizeFloatValue} = useEventChecked(envData.summarizeFloat)
   const [apiKeyValue, { onChange: onChangeApiKeyValue }] = useEventTarget({initialValue: envData.apiKey??''})
   const [serverUrlValue, setServerUrlValue] = useState(envData.serverUrl)
+  const [geminiApiKeyValue, { onChange: onChangeGeminiApiKeyValue }] = useEventTarget({initialValue: envData.geminiApiKey??''})
   const [languageValue, { onChange: onChangeLanguageValue }] = useEventTarget({initialValue: envData.language??LANGUAGE_DEFAULT})
   const [modelValue, { onChange: onChangeModelValue }] = useEventTarget({initialValue: envData.model??MODEL_DEFAULT})
+  const [customModelValue, { onChange: onChangeCustomModelValue }] = useEventTarget({initialValue: envData.customModel})
+  const [customModelTokensValue, setCustomModelTokensValue] = useState(envData.customModelTokens)
   const [summarizeLanguageValue, { onChange: onChangeSummarizeLanguageValue }] = useEventTarget({initialValue: envData.summarizeLanguage??SUMMARIZE_LANGUAGE_DEFAULT})
   const [hideOnDisableAutoTranslateValue, setHideOnDisableAutoTranslateValue] = useState(envData.hideOnDisableAutoTranslate)
   const [themeValue, setThemeValue] = useState(envData.theme)
   const [fontSizeValue, setFontSizeValue] = useState(envData.fontSize)
+  const [aiTypeValue, setAiTypeValue] = useState(envData.aiType)
   const [transDisplayValue, setTransDisplayValue] = useState(envData.transDisplay)
-  const [wordsValue, setWordsValue] = useState<number | undefined>(envData.words??WORDS_DEFAULT)
+  const [wordsValue, setWordsValue] = useState<number | undefined>(envData.words)
   const [fetchAmountValue, setFetchAmountValue] = useState(envData.fetchAmount??TRANSLATE_FETCH_DEFAULT)
   const [moreFold, {toggle: toggleMoreFold}] = useBoolean(true)
   const [promptsFold, {toggle: togglePromptsFold}] = useBoolean(true)
@@ -91,6 +101,12 @@ const Settings = () => {
     }
     return list
   }, [])
+  const apiKeySetted = useMemo(() => {
+    if (aiTypeValue === 'gemini') {
+      return !!geminiApiKeyValue
+    }
+    return !!apiKeyValue
+  }, [aiTypeValue, apiKeyValue, geminiApiKeyValue])
 
   const onChangeHideOnDisableAutoTranslate = useCallback((e: any) => {
     setHideOnDisableAutoTranslateValue(e.target.checked)
@@ -99,9 +115,13 @@ const Settings = () => {
   const onSave = useCallback(() => {
     dispatch(setEnvData({
       autoExpand: autoExpandValue,
+      aiType: aiTypeValue,
       apiKey: apiKeyValue,
       serverUrl: serverUrlValue,
       model: modelValue,
+      customModel: customModelValue,
+      customModelTokens: customModelTokensValue,
+      geminiApiKey: geminiApiKeyValue,
       translateEnable: translateEnableValue,
       language: languageValue,
       hideOnDisableAutoTranslate: hideOnDisableAutoTranslateValue,
@@ -116,10 +136,11 @@ const Settings = () => {
       prompts: promptsValue,
       searchEnabled: searchEnabledValue,
       cnSearchEnabled: cnSearchEnabledValue,
+      askEnabled: askEnabledValue,
     }))
     dispatch(setPage(PAGE_MAIN))
     toast.success('保存成功')
-  }, [dispatch, autoExpandValue, apiKeyValue, serverUrlValue, modelValue, translateEnableValue, languageValue, hideOnDisableAutoTranslateValue, themeValue, transDisplayValue, summarizeEnableValue, summarizeFloatValue, summarizeLanguageValue, wordsValue, fetchAmountValue, fontSizeValue, promptsValue, searchEnabledValue, cnSearchEnabledValue])
+  }, [dispatch, autoExpandValue, aiTypeValue, apiKeyValue, serverUrlValue, modelValue, customModelValue, customModelTokensValue, geminiApiKeyValue, translateEnableValue, languageValue, hideOnDisableAutoTranslateValue, themeValue, transDisplayValue, summarizeEnableValue, summarizeFloatValue, summarizeLanguageValue, wordsValue, fetchAmountValue, fontSizeValue, promptsValue, searchEnabledValue, cnSearchEnabledValue, askEnabledValue])
 
   const onCancel = useCallback(() => {
     dispatch(setPage(PAGE_MAIN))
@@ -165,6 +186,14 @@ const Settings = () => {
     setFontSizeValue('large')
   }, [])
 
+  const onSelOpenai = useCallback(() => {
+    setAiTypeValue('openai')
+  }, [])
+
+  const onSelGemini = useCallback(() => {
+    setAiTypeValue('gemini')
+  }, [])
+
   return <div className='text-sm overflow-y-auto' style={{
     height: fold?undefined:`${totalHeight-HEADER_HEIGHT}px`,
   }}>
@@ -187,62 +216,83 @@ const Settings = () => {
             <button onClick={onSelFontSize2} className={classNames('btn btn-xs no-animation', fontSizeValue === 'large'?'btn-active':'')}>加大</button>
           </div>
         </FormItem>
+        <FormItem title='AI类型' tip='OPENAI质量更高'>
+          <div className="btn-group">
+            <button onClick={onSelOpenai} className={classNames('btn btn-xs no-animation', (!aiTypeValue || aiTypeValue === 'openai')?'btn-active':'')}>OpenAI</button>
+            <button onClick={onSelGemini} className={classNames('btn btn-xs no-animation', aiTypeValue === 'gemini'?'btn-active':'')}>Gemini</button>
+          </div>
+        </FormItem>
       </Section>
-      <Section title='openai配置'>
+
+      {(!aiTypeValue || aiTypeValue === 'openai') && <Section title='openai配置'>
         <FormItem title='ApiKey' htmlFor='apiKey'>
-          <input id='apiKey' type='text' className='input input-sm input-bordered w-full' placeholder='sk-xxx' value={apiKeyValue} onChange={onChangeApiKeyValue}/>
+          <input id='apiKey' type='text' className='input input-sm input-bordered w-full' placeholder='sk-xxx'
+                 value={apiKeyValue} onChange={onChangeApiKeyValue}/>
         </FormItem>
         <FormItem title='服务器' htmlFor='serverUrl'>
-          <input id='serverUrl' type='text' className='input input-sm input-bordered w-full' placeholder='服务器地址,默认使用官方地址' value={serverUrlValue} onChange={e => setServerUrlValue(e.target.value)}/>
+          <input id='serverUrl' type='text' className='input input-sm input-bordered w-full'
+                 placeholder={DEFAULT_SERVER_URL_OPENAI} value={serverUrlValue}
+                 onChange={e => setServerUrlValue(e.target.value)}/>
         </FormItem>
-        <div className='flex justify-center'>
+        <div>
-          <a className='link text-xs' onClick={toggleMoreFold}>{moreFold?'点击查看说明':'点击折叠说明'}</a>
+          <div className='desc text-xs text-center'>
+            <div className='flex justify-center font-semibold'>【官方地址】</div>
+            <div>官方网址：<a className='link link-primary' href='https://platform.openai.com/' target='_blank'
+                             rel="noreferrer">点击访问</a></div>
+            <div>服务器地址：<a className='link link-primary'
+                               onClick={() => setServerUrlValue(DEFAULT_SERVER_URL_OPENAI)}
+                               rel='noreferrer'>点击设置</a></div>
+            {/* <div className='flex justify-center font-semibold'>【第三方代理】</div> */}
+            {/* <div>代理网址：<a className='link link-primary' href='https://api.openai-up.com/register?aff=varM' */}
+            {/*                 target='_blank' */}
+            {/*                 rel="noreferrer">点击访问</a></div> */}
+            {/* <div>服务器地址：<a className='link link-primary' */}
+            {/*                   onClick={() => setServerUrlValue('https://api.openai-up.com')} */}
+            {/*                   rel='noreferrer'>点击设置</a></div> */}
+            {/* <div className='text-amber-600 flex justify-center items-center'><FaGripfire/>目前价格不到官方价格的6折<FaGripfire/></div> */}
+          </div>
         </div>
-        {!moreFold && <div>
+        <FormItem title='模型选择' htmlFor='modelSel' tip='注意，不同模型有不同价格与token限制'>
-          <ul className='pl-3 list-decimal desc text-xs'>
+          <select id='modelSel' className="select select-sm select-bordered" value={modelValue}
-            <li>官方服务器需要科学上网才能访问</li>
+                  onChange={onChangeModelValue}>
-            <li>官方网址：<a className='link' href='https://platform.openai.com/' target='_blank' rel="noreferrer">openai.com</a></li>
-            <li>支持官方代理(使用官方ApiKey)：<a className='link' onClick={() => setServerUrlValue(SERVER_URL_THIRD)} rel='noreferrer'>点击设置</a></li>
-            <li>支持代理(配合ApiKey)：<a className='link' href='https://api2d.com/' target='_blank' rel="noreferrer">api2d</a> | <a className='link' onClick={() => setServerUrlValue('https://openai.api2d.net')} rel='noreferrer'>点击设置</a></li>
-            <li>支持代理(配合ApiKey)：<a className='link' href='https://openaimax.com/' target='_blank' rel="noreferrer">OpenAI-Max</a> | <a className='link' onClick={() => setServerUrlValue('https://api.openaimax.com')} rel='noreferrer'>点击设置</a></li>
-            <li>支持代理(配合ApiKey)：<a className='link' href='https://openai-sb.com/' target='_blank' rel="noreferrer">OpenAI-SB</a> | <a className='link' onClick={() => setServerUrlValue('https://api.openai-sb.com')} rel='noreferrer'>点击设置</a></li>
-            <li>支持代理(配合ApiKey)：<a className='link' href='https://www.ohmygpt.com/' target='_blank' rel="noreferrer">OhMyGPT</a> | <a className='link' onClick={() => setServerUrlValue('https://api.ohmygpt.com')} rel='noreferrer'>点击设置</a></li>
-            <li>支持代理(配合ApiKey)：<a className='link' href='https://aiproxy.io/' target='_blank' rel="noreferrer">AIProxy</a> | <a className='link' onClick={() => setServerUrlValue('https://api.aiproxy.io')} rel='noreferrer'>点击设置</a></li>
-            <li>支持代理(配合ApiKey)：<a className='link' href='https://key-rental.bowen.cool/' target='_blank' rel="noreferrer">Key Rental</a> | <a className='link' onClick={() => setServerUrlValue('https://key-rental-api.bowen.cool/openai')} rel='noreferrer'>点击设置</a></li>
-            <li>支持其他第三方代理，有问题可加群交流</li>
-          </ul>
-        </div>}
-        <FormItem title='模型选择' htmlFor='modelSel' tip='注意，不同模型有不同价格'>
-          <select id='modelSel' className="select select-sm select-bordered" value={modelValue} onChange={onChangeModelValue}>
             {MODELS.map(model => <option key={model.code} value={model.code}>{model.name}</option>)}
           </select>
         </FormItem>
-        <div className='flex justify-center'>
+        <div className='desc text-xs'>
-          <a className='link text-xs' onClick={togglePromptsFold}>{promptsFold?'点击查看提示词':'点击折叠提示词'}</a>
+          {MODEL_TIP}
         </div>
-        {!promptsFold && <div>
+        {modelValue === 'custom' && <FormItem title='模型名' htmlFor='customModel'>
-          {PROMPT_TYPES.map((item, idx) => <FormItem key={item.type} title={<div>
+          <input id='customModel' type='text' className='input input-sm input-bordered w-full' placeholder='llama2'
-            <div>{item.name}</div>
+                 value={customModelValue} onChange={onChangeCustomModelValue}/>
-            <div className='link text-xs' onClick={() => {
+        </FormItem>}
-              setPromptsValue({
+        {modelValue === 'custom' && <FormItem title='Token上限' htmlFor='customModelTokens'>
-                ...promptsValue,
+          <input id='customModelTokens' type='number' className='input input-sm input-bordered w-full'
-                // @ts-expect-error
+                 placeholder={'' + CUSTOM_MODEL_TOKENS}
-                [item.type]: PROMPT_DEFAULTS[item.type]??''
+                 value={customModelTokensValue}
-              })
+                 onChange={e => setCustomModelTokensValue(e.target.value ? parseInt(e.target.value) : undefined)}/>
-            }}>点击填充默认</div>
+        </FormItem>}
-          </div>} htmlFor={`prompt-${item.type}`}>
+      </Section>}
-            <textarea id={`prompt-${item.type}`} className='mt-2 textarea input-bordered w-full' placeholder='留空使用默认提示词' value={promptsValue[item.type]??''} onChange={(e) => {
+
-              setPromptsValue({
+      {aiTypeValue === 'gemini' && <Section title='gemini配置'>
-                ...promptsValue,
+        <FormItem title='ApiKey' htmlFor='geminiApiKey'>
-                [item.type]: e.target.value
+          <input id='geminiApiKey' type='text' className='input input-sm input-bordered w-full' placeholder='xxx'
-              })
+                 value={geminiApiKeyValue} onChange={onChangeGeminiApiKeyValue}/>
-            }}/>
+        </FormItem>
-          </FormItem>)}
+        <div>
-        </div>}
+          <div className='desc text-xs'>
-      </Section>
+            <div>官方网址：<a className='link link-primary' href='https://makersuite.google.com/app/apikey'
+                             target='_blank'
+                             rel="noreferrer">Google AI Studio</a> (目前免费)
+            </div>
+            <div className='text-xs text-error flex items-center'><IoWarning className='text-sm text-warning'/>谷歌模型安全要求比较高，有些视频可能无法生成总结!
+            </div>
+          </div>
+        </div>
+      </Section>}
+
       <Section title={<div className='flex items-center'>
         翻译配置
-        {!apiKeyValue && <div className='tooltip tooltip-right ml-1' data-tip='未设置ApiKey无法使用'>
+        {!apiKeySetted && <div className='tooltip tooltip-right ml-1' data-tip='未设置ApiKey无法使用'>
           <IoWarning className='text-sm text-warning'/>
         </div>}
       </div>}>
@@ -251,7 +301,8 @@ const Settings = () => {
                  onChange={setTranslateEnableValue}/>
         </FormItem>
         <FormItem title='目标语言' htmlFor='language'>
-          <select id='language' className="select select-sm select-bordered" value={languageValue} onChange={onChangeLanguageValue}>
+          <select id='language' className="select select-sm select-bordered" value={languageValue}
+                  onChange={onChangeLanguageValue}>
             {LANGUAGES.map(language => <option key={language.code} value={language.code}>{language.name}</option>)}
           </select>
         </FormItem>
@@ -277,7 +328,7 @@ const Settings = () => {
       </Section>
       <Section title={<div className='flex items-center'>
         总结配置
-        {!apiKeyValue && <div className='tooltip tooltip-right ml-1' data-tip='未设置ApiKey无法使用'>
+        {!apiKeySetted && <div className='tooltip tooltip-right ml-1' data-tip='未设置ApiKey无法使用'>
           <IoWarning className='text-sm text-warning'/>
         </div>}
       </div>}>
@@ -296,13 +347,17 @@ const Settings = () => {
         </FormItem>
         <FormItem htmlFor='words' title='分段字数' tip='注意，不同模型有不同字数限制'>
           <div className='flex-1 flex flex-col'>
-            <input id='words' type='number' className='input input-sm input-bordered w-full' placeholder='默认2000' value={wordsValue} onChange={e => setWordsValue(e.target.value?parseInt(e.target.value):undefined)}/>
+            <input id='words' type='number' className='input input-sm input-bordered w-full' placeholder={`默认为上限x${WORDS_RATE}`} value={wordsValue??''} onChange={e => setWordsValue(e.target.value?parseInt(e.target.value):undefined)}/>
             {/* <input type="range" min={WORDS_MIN} max={WORDS_MAX} step={WORDS_STEP} value={wordsValue} className="range range-primary" onChange={onWordsChange} /> */}
             {/* <div className="w-full flex justify-between text-xs px-2"> */}
             {/*  {wordsList.map(words => <span key={words}>{words}</span>)} */}
             {/* </div> */}
           </div>
         </FormItem>
+        <div className='desc text-xs'>
+          当前选择的模型的分段字数上限是<span className='font-semibold font-mono'>{aiTypeValue === 'gemini'?GEMINI_TOKENS:(MODEL_MAP[modelValue??MODEL_DEFAULT]?.tokens??'未知')}</span>
+          （太接近上限总结会报错）
+        </div>
       </Section>
       <Section title={<div className='flex items-center'>
         搜索配置
@@ -316,9 +371,49 @@ const Settings = () => {
                  onChange={setCnSearchEnabledValue}/>
         </FormItem>
       </Section>
+      <Section title={<div className='flex items-center'>
+        提问配置
+      </div>}>
+        <FormItem title='启用提问' htmlFor='askEnabled' tip='是否启用字幕提问功能'>
+          <input id='askEnabled' type='checkbox' className='toggle toggle-primary' checked={askEnabledValue}
+                 onChange={setAskEnabledValue}/>
+        </FormItem>
+      </Section>
+
+      <Section title='提示词配置'>
+        <div className='flex justify-center'>
+          <a className='text-xs link link-primary' onClick={togglePromptsFold}>点击{promptsFold ? '展开' : '折叠'}</a>
+        </div>
+        {!promptsFold && PROMPT_TYPES.map((item, idx) => <FormItem key={item.type} title={<div>
+          <div>{item.name}</div>
+          <div className='link text-xs' onClick={() => {
+            setPromptsValue({
+              ...promptsValue,
+              // @ts-expect-error
+              [item.type]: PROMPT_DEFAULTS[item.type] ?? ''
+            })
+          }}>点击填充默认
+          </div>
+        </div>} htmlFor={`prompt-${item.type}`}>
+          <textarea id={`prompt-${item.type}`} className='mt-2 textarea input-bordered w-full'
+                    placeholder='留空使用默认提示词' value={promptsValue[item.type] ?? ''} onChange={(e) => {
+                      setPromptsValue({
+                        ...promptsValue,
+                        [item.type]: e.target.value
+                      })
+                    }}/>
+        </FormItem>)}
+      </Section>
+
       <div className='flex justify-center gap-5'>
         <button className='btn btn-primary btn-sm' onClick={onSave}>保存</button>
         <button className='btn btn-sm' onClick={onCancel}>取消</button>
+        {/* <button className='btn btn-sm' onClick={() => {
+          dispatch(setTempData({
+            reviewed: undefined,
+            // reviewActions: 0
+          }))
+        }}>重置</button> */}
       </div>
     </div>
   </div>

src/chrome/content-script.cjs

@@ -24,7 +24,7 @@ const timerIframe = setInterval(function () {
       const iframe = document.createElement('iframe')
       iframe.id = IFRAME_ID
       iframe.src = chrome.runtime.getURL('index.html')
-      iframe.style = 'border: none; width: 100%; height: 44px;'
+      iframe.style = 'border: none; width: 100%; height: 44px;margin-bottom: 3px;'
       iframe.allow = 'clipboard-read; clipboard-write;'
       if (vKey) {
         iframe.dataset[vKey] = danmukuBox?.dataset[vKey]
@@ -102,6 +102,7 @@ const refreshVideoInfo = async () => {
       //send setVideoInfo
       iframe.contentWindow.postMessage({
         type: 'setVideoInfo',
+        url: location.origin + location.pathname,
         title,
         aid,
         pages,
@@ -157,6 +158,9 @@ window.addEventListener("message", (event) => {
     const video = getVideoElement()
     if (video) {
       video.currentTime = data.time
+      if (data.togglePause) {
+        video.paused ? video.play() : video.pause()
+      }
     }
   }
 

src/chrome/openaiService.ts

@@ -1,4 +1,14 @@
-import {getServerUrl} from '../util/biz_util'
+import {DEFAULT_SERVER_URL_OPENAI} from '../const'
+
+const getServerUrl = (serverUrl?: string) => {
+  if (!serverUrl) {
+    return DEFAULT_SERVER_URL_OPENAI
+  }
+  if (serverUrl.endsWith('/')) {
+    serverUrl = serverUrl.slice(0, -1)
+  }
+  return serverUrl
+}
 
 export const handleChatCompleteTask = async (task: Task) => {
   const data = task.def.data
@@ -18,3 +28,16 @@ export const handleChatCompleteTask = async (task: Task) => {
     throw new Error(`${task.resp.error.code as string??''} ${task.resp.error.message as string ??''}`)
   }
 }
+
+export const handleGeminiChatCompleteTask = async (task: Task) => {
+  const data = task.def.data
+  const resp = await fetch('https://generativelanguage.googleapis.com/v1/models/gemini-pro:generateContent', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'x-goog-api-key': task.def.extra.geminiApiKey,
+    },
+    body: JSON.stringify(data),
+  })
+  task.resp = await resp.json()
+}

src/chrome/taskService.ts

@@ -1,5 +1,5 @@
 import {TASK_EXPIRE_TIME} from '../const'
-import {handleChatCompleteTask} from './openaiService'
+import {handleChatCompleteTask, handleGeminiChatCompleteTask} from './openaiService'
 
 export const tasksMap = new Map<string, Task>()
 
@@ -11,6 +11,9 @@ export const handleTask = async (task: Task) => {
       case 'chatComplete':
         await handleChatCompleteTask(task)
         break
+      case 'geminiChatComplete':
+        await handleGeminiChatCompleteTask(task)
+        break
       default:
         // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         throw new Error(`任务类型不支持: ${task.def.type}`)

src/components/Markdown.tsx

@@ -0,0 +1,46 @@
+import classNames from 'classnames'
+import ReactMarkdown from 'react-markdown'
+import toast from 'react-hot-toast'
+
+function CopyBtn(props: {
+  content: string
+}) {
+  const {content} = props
+  return <div className='flex justify-center mt-1'>
+    <button className="btn btn-xs px-10 btn-primary normal-case" onClick={() => {
+      navigator.clipboard.writeText(content).then(() => {
+        toast.success('Copied!')
+      }).catch(console.error)
+    }}>Copy
+    </button>
+  </div>
+}
+
+function Markdown(props: {
+  content: string
+  codeBlockClass?: string
+}) {
+  const {content, codeBlockClass} = props
+
+  return <ReactMarkdown
+    className='markdown prose prose-sm dark:prose-invert prose-h1:text-center prose-h1:font-bold prose-h1:underline-offset-4 overflow-y-auto scrollbar-hide'
+    linkTarget={'_blank'}
+    components={{
+      code({node, inline, className, children, ...props}) {
+        if (inline) {
+          return <code
+            className={classNames(className, 'md-inline-block kbd kbd-xs rounded text-base-content/80')} {...props}>
+            {children}
+          </code>
+        } else {
+          return <code className={classNames(className, 'relative', codeBlockClass)} {...props}>
+            {children}
+            {className?.includes('language-copy') && <CopyBtn content={children[0] as string}/>}
+          </code>
+        }
+      }
+    }}
+  >{content}</ReactMarkdown>
+}
+
+export default Markdown

src/components/RateExtension.tsx

@@ -0,0 +1,53 @@
+import React, { useState } from 'react';
+import { FaStar } from 'react-icons/fa';
+import { IoMdClose } from 'react-icons/io';
+import { setTempData } from '../redux/envReducer';
+import { useAppDispatch, useAppSelector } from '../hooks/redux';
+import { openUrl } from '@kky002/kky-util';
+
+const RateExtension: React.FC = () => {
+  const dispatch = useAppDispatch()
+  const [isHovered, setIsHovered] = useState(false);
+  const reviewed = useAppSelector(state => state.env.tempData.reviewed)
+
+  const handleRateClick = () => {
+    dispatch(setTempData({
+      reviewed: true
+    }))
+    // Chrome Web Store URL for your extension
+    openUrl(import.meta.env.VITE_REVIEW_URL)
+  };
+
+  if (reviewed === true || reviewed === undefined) return null;
+
+  return (
+    <div className="relative bg-gradient-to-r from-primary to-secondary text-primary-content p-4 rounded-lg shadow-lg text-sm transition-all duration-300 ease-in-out hover:shadow-xl">
+      <button
+        onClick={() => {
+          dispatch(setTempData({
+            reviewed: true
+          }))
+        }}
+        className="absolute top-2 right-2 text-primary-content opacity-70 hover:opacity-100 transition-opacity"
+      >
+        <IoMdClose size={20} />
+      </button>
+      <h3 className="text-lg font-bold mb-2 animate-pulse">喜欢这个扩展吗？</h3>
+      <p className="mb-3">如果觉得有用，请给我们评分！</p>
+      <button
+        onClick={handleRateClick}
+        onMouseEnter={() => setIsHovered(true)}
+        onMouseLeave={() => setIsHovered(false)}
+        className="btn btn-accent btn-sm gap-2 transition-all duration-300 ease-in-out hover:scale-105"
+      >
+        <FaStar className={`inline-block text-yellow-300 ${isHovered ? 'animate-spin' : ''}`} />
+        去评分
+        <span className="transition-transform duration-300 ease-in-out transform inline-block">
+          {isHovered ? '🚀' : '→'}
+        </span>
+      </button>
+    </div>
+  );
+};
+
+export default RateExtension;

src/const.tsx

@@ -8,7 +8,9 @@ export const STORAGE_TEMP = 'bilibili-subtitle_temp'
 export const PROMPT_TYPE_TRANSLATE = 'translate'
 export const PROMPT_TYPE_SUMMARIZE_OVERVIEW = 'summarize_overview'
 export const PROMPT_TYPE_SUMMARIZE_KEYPOINT = 'summarize_keypoint'
+export const PROMPT_TYPE_SUMMARIZE_QUESTION = 'summarize_question'
 export const PROMPT_TYPE_SUMMARIZE_BRIEF = 'summarize_brief'
+export const PROMPT_TYPE_ASK = 'ask'
 export const PROMPT_TYPES = [{
   name: '翻译',
   type: PROMPT_TYPE_TRANSLATE,
@@ -21,6 +23,12 @@ export const PROMPT_TYPES = [{
 }, {
   name: '总结',
   type: PROMPT_TYPE_SUMMARIZE_BRIEF,
+}, {
+  name: '问题',
+  type: PROMPT_TYPE_SUMMARIZE_QUESTION,
+}, {
+  name: '提问',
+  type: PROMPT_TYPE_ASK,
 }]
 
 export const SUMMARIZE_TYPES = {
@@ -42,6 +50,12 @@ export const SUMMARIZE_TYPES = {
     downloadName: '💡视频要点💡',
     promptType: PROMPT_TYPE_SUMMARIZE_KEYPOINT,
   },
+  question: {
+    name: '问题',
+    desc: '常见问题',
+    downloadName: '💡常见问题💡',
+    promptType: PROMPT_TYPE_SUMMARIZE_QUESTION,
+  },
 }
 
 export const PROMPT_DEFAULTS = {
@@ -119,7 +133,60 @@ The video's subtitles:
 
 '''
 {{segment}}
-'''`
+'''`,
+  [PROMPT_TYPE_SUMMARIZE_QUESTION]: `You are a helpful assistant that skilled at extracting questions from video subtitle.
+
+## Context
+
+The video's title: '''{{title}}'''.
+The video's subtitles:
+
+'''
+{{segment}}
+'''
+
+## Command
+
+Accurately extract key questions and their corresponding answers from the video subtitles based on the actual content provided. The number of questions should be between 3 and 5.
+
+- Identify questions as sentences starting with interrogative words (e.g., "What", "How", "Why") and extract the following sentences that directly answer these questions.
+- Include only those questions and answers that are relevant to the main points of the video, and ensure they cover different aspects of the video's content.
+- If an answer spans multiple non-consecutive parts of the subtitles, concatenate them into a coherent response without adding any information not present in the subtitles.
+- In cases where the number of potential Q&As exceeds 5, prioritize the most informative and directly answered ones.
+- If clear questions and answers are not available in the subtitles, refrain from creating them and instead note the absence of direct Q&As.
+- Answer in language '{{language}}'.
+- Format the output in markdown json format, as specified.
+
+## Output format
+
+Provide an example to illustrate the expected output:
+
+\`\`\`json
+[
+    {
+        "q": "What is the main theme of the video?",
+        "a": "The main theme of the video is explained as..."
+    },
+    {
+        "q": "How is the topic developed?",
+        "a": "The topic is developed through various examples, including..."
+    }
+]
+\`\`\`
+`,
+  [PROMPT_TYPE_ASK]: `You are a helpful assistant who answers question related to video subtitles.
+Answer in language '{{language}}'.
+
+The video's title: '''{{title}}'''.
+The video's subtitles:
+
+'''
+{{segment}}
+'''
+
+Question: '''{{question}}'''
+Answer:
+`,
 }
 
 export const EVENT_EXPAND = 'expand'
@@ -142,29 +209,38 @@ export const TOTAL_HEIGHT_MAX = 800
 export const HEADER_HEIGHT = 44
 export const TITLE_HEIGHT = 24
 export const SEARCH_BAR_HEIGHT = 32
+export const RECOMMEND_HEIGHT = 36
 
-export const WORDS_DEFAULT = import.meta.env.VITE_ENV === 'web-dev'?500:2000
+export const WORDS_RATE = 0.75
 export const WORDS_MIN = 500
 export const WORDS_MAX = 16000
 export const WORDS_STEP = 500
 export const SUMMARIZE_THRESHOLD = 100
 export const SUMMARIZE_LANGUAGE_DEFAULT = 'cn'
 export const SUMMARIZE_ALL_THRESHOLD = 5
+export const ASK_ENABLED_DEFAULT = true
+export const DEFAULT_SERVER_URL_OPENAI = 'https://api.openai.com'
+export const CUSTOM_MODEL_TOKENS = 16385
 
-export const SERVER_URL_OPENAI = 'https://api.openai.com'
+export const MODEL_TIP = '推荐gpt-4o-mini，能力强，价格低，token上限大'
-export const SERVER_URL_THIRD = 'https://op.kongkongye.com'
-
 export const MODELS = [{
-  code: 'gpt-3.5-turbo',
+  code: 'gpt-4o-mini',
-  name: 'gpt-3.5-turbo',
+  name: 'gpt-4o-mini',
+  tokens: 128000,
 }, {
-  code: 'gpt-3.5-turbo-16k',
+  code: 'gpt-3.5-turbo-0125',
-  name: 'gpt-3.5-turbo-16k',
+  name: 'gpt-3.5-turbo-0125',
+  tokens: 16385,
 }, {
-  code: 'gpt-3.5-turbo-1106',
+  code: 'custom',
-  name: 'gpt-3.5-turbo-1106',
+  name: '自定义',
 }]
+export const GEMINI_TOKENS = 32768
 export const MODEL_DEFAULT = MODELS[0].code
+export const MODEL_MAP: {[key: string]: typeof MODELS[number]} = {}
+for (const model of MODELS) {
+  MODEL_MAP[model.code] = model
+}
 
 export const LANGUAGES = [{
   code: 'en',

src/hooks/useKeyService.ts

@@ -0,0 +1,84 @@
+import {useEffect} from 'react'
+import {useMemoizedFn} from 'ahooks/es'
+import {useAppDispatch, useAppSelector} from './redux'
+import useSubtitle from './useSubtitle'
+import {setInputting} from '../redux/envReducer'
+
+const useKeyService = () => {
+  const dispatch = useAppDispatch()
+  const inputting = useAppSelector(state => state.env.inputting)
+  const curIdx = useAppSelector(state => state.env.curIdx)
+  const data = useAppSelector(state => state.env.data)
+  const {move} = useSubtitle()
+
+  // 输入中
+  useEffect(() => {
+    const onInputtingStart = (e: CompositionEvent) => {
+      dispatch(setInputting(true))
+    }
+    const onInputtingEnd = (e: CompositionEvent) => {
+      dispatch(setInputting(false))
+    }
+
+    document.addEventListener('compositionstart', onInputtingStart)
+    document.addEventListener('compositionend', onInputtingEnd)
+    return () => {
+      document.removeEventListener('compositionstart', onInputtingStart)
+      document.removeEventListener('compositionend', onInputtingEnd)
+    }
+  }, [dispatch])
+
+  const onKeyDown = useMemoizedFn((e: KeyboardEvent) => {
+    // 当前在输入中（如中文输入法）
+    if (inputting) {
+      return
+    }
+
+    // 有按其他控制键时，不触发
+    if (e.ctrlKey || e.metaKey || e.shiftKey) {
+      return
+    }
+
+    let cursorInInput = false
+    if (document.activeElement != null) {
+      const tagName = document.activeElement.tagName
+      if (tagName === 'INPUT' || tagName === 'TEXTAREA') {
+        cursorInInput = true
+      }
+    }
+    let prevent = false
+
+    // up arrow
+    if (e.key === 'ArrowUp') {
+      if (curIdx && (data != null) && !cursorInInput) {
+        prevent = true
+        const newCurIdx = Math.max(curIdx - 1, 0)
+        move(data.body[newCurIdx].from, false)
+      }
+    }
+    // down arrow
+    if (e.key === 'ArrowDown') {
+      if (curIdx !== undefined && (data != null) && !cursorInInput) {
+        prevent = true
+        const newCurIdx = Math.min(curIdx + 1, data.body.length - 1)
+        move(data.body[newCurIdx].from, false)
+      }
+    }
+
+    // 阻止默认事件
+    if (prevent) {
+      e.preventDefault()
+      e.stopPropagation()
+    }
+  })
+
+  // 检测快捷键
+  useEffect(() => {
+    document.addEventListener('keydown', onKeyDown)
+    return () => {
+      document.removeEventListener('keydown', onKeyDown)
+    }
+  }, [onKeyDown])
+}
+
+export default useKeyService

src/hooks/useSearchService.ts

@@ -21,6 +21,9 @@ const useSearchService = () => {
 
   // reset search
   useEffect(() => {
+    if (!envData.searchEnabled) {
+      return
+    }
     const startTime = Date.now()
     const docs: Document[] = []
     for (const item of data?.body??[]) {
@@ -35,13 +38,13 @@ const useSearchService = () => {
     // 日志
     const endTime = Date.now()
     console.debug(`[Search]reset ${docs.length} docs, cost ${endTime-startTime}ms`)
-  }, [data?.body, dispatch, reset])
+  }, [data?.body, dispatch, envData.searchEnabled, reset])
 
   // search text
   useEffect(() => {
     const searchResult: Set<number> = new Set()
 
-    if (searchText) {
+    if (envData.searchEnabled && searchText) {
       // @ts-expect-error
       const documents: Document[] | undefined = search(searchText)
       if (documents != null) {
@@ -52,7 +55,7 @@ const useSearchService = () => {
     }
 
     dispatch(setSearchResult(searchResult))
-  }, [dispatch, search, searchText])
+  }, [dispatch, envData.searchEnabled, search, searchText])
 }
 
 export default useSearchService

src/hooks/useSubtitle.ts

@@ -1,13 +1,24 @@
-import {useAppDispatch} from './redux'
+import {useAppDispatch, useAppSelector} from './redux'
 import React, {useCallback} from 'react'
-import {setNeedScroll} from '../redux/envReducer'
+import {setNeedScroll, setReviewAction, setTempData} from '../redux/envReducer'
 
 const useSubtitle = () => {
   const dispatch = useAppDispatch()
+  const reviewed = useAppSelector(state => state.env.tempData.reviewed)
+  const reviewAction = useAppSelector(state => state.env.reviewAction)
+  const reviewActions = useAppSelector(state => state.env.tempData.reviewActions)
 
-  const move = useCallback((time: number) => {
+  const move = useCallback((time: number, togglePause: boolean) => {
-    window.parent.postMessage({type: 'move', time}, '*')
+    window.parent.postMessage({type: 'move', time, togglePause}, '*')
-  }, [])
+
+    //review action
+    if (reviewed === undefined && !reviewAction) {
+      dispatch(setReviewAction(true))
+      dispatch(setTempData({
+        reviewActions: (reviewActions ?? 0) + 1
+      }))
+    }
+  }, [dispatch, reviewAction, reviewActions, reviewed])
 
   const scrollIntoView = useCallback((ref: React.RefObject<HTMLDivElement>) => {
     ref.current?.scrollIntoView({behavior: 'smooth', block: 'center'})

src/hooks/useSubtitleService.ts

@@ -12,11 +12,13 @@ import {
   setSegments,
   setTitle,
   setTotalHeight,
+  setUrl,
+  setTempData,
 } from '../redux/envReducer'
 import {EventBusContext} from '../Router'
-import {EVENT_EXPAND, TOTAL_HEIGHT_MAX, TOTAL_HEIGHT_MIN, WORDS_DEFAULT, WORDS_MAX, WORDS_MIN} from '../const'
+import {EVENT_EXPAND, GEMINI_TOKENS, TOTAL_HEIGHT_MAX, TOTAL_HEIGHT_MIN, WORDS_MIN, WORDS_RATE} from '../const'
 import {useInterval} from 'ahooks'
-import {getWholeText} from '../util/biz_util'
+import {getModelMaxTokens, getWholeText} from '../util/biz_util'
 
 /**
  * Service是单例，类似后端的服务概念
@@ -38,6 +40,17 @@ const useSubtitleService = () => {
   const transResults = useAppSelector(state => state.env.transResults)
   const hideOnDisableAutoTranslate = useAppSelector(state => state.env.envData.hideOnDisableAutoTranslate)
   const autoTranslate = useAppSelector(state => state.env.autoTranslate)
+  const reviewed = useAppSelector(state => state.env.tempData.reviewed)
+  const reviewActions = useAppSelector(state => state.env.tempData.reviewActions)
+
+  //如果reviewActions达到15次，则设置reviewed为false
+  useEffect(() => {
+    if (reviewed === undefined && reviewActions && reviewActions >= 15) {
+      dispatch(setTempData({
+        reviewed: false
+      }))
+    }
+  }, [reviewActions, dispatch, reviewed])
 
   // 监听消息
   useEffect(() => {
@@ -46,6 +59,7 @@ const useSubtitleService = () => {
 
       if (data.type === 'setVideoInfo') {
         dispatch(setInfos(data.infos))
+        dispatch(setUrl(data.url))
         dispatch(setTitle(data.title))
         console.debug('video title: ', data.title)
       }
@@ -94,7 +108,7 @@ const useSubtitleService = () => {
         type: EVENT_EXPAND
       })
     }
-  }, [data, eventBus])
+  }, [data, eventBus, infos])
 
   // 当前未展示 & (未折叠 | 自动展开) & 有列表 => 展示第一个
   useEffect(() => {
@@ -156,8 +170,15 @@ const useSubtitleService = () => {
     const items = data?.body
     if (items != null) {
       if (envData.summarizeEnable) { // 分段
-        let size = envData.words??WORDS_DEFAULT
+        let size = envData.words
-        size = Math.min(Math.max(size, WORDS_MIN), WORDS_MAX)
+        if (!size) { // 默认
+          if (envData.aiType === 'gemini') {
+            size = GEMINI_TOKENS*WORDS_RATE
+          } else {
+            size = getModelMaxTokens(envData)*WORDS_RATE
+          }
+        }
+        size = Math.max(size, WORDS_MIN)
 
         segments = []
         let transcriptItems: TranscriptItem[] = []
@@ -191,7 +212,7 @@ const useSubtitleService = () => {
       }
     }
     dispatch(setSegments(segments))
-  }, [data?.body, dispatch, envData.summarizeEnable, envData.words])
+  }, [data?.body, dispatch, envData])
 
   // 每秒更新当前视频时间
   useInterval(() => {

src/hooks/useTranslate.ts

@@ -4,17 +4,20 @@ import {
   addTaskId,
   addTransResults,
   delTaskId,
+  mergeAskInfo,
   setLastSummarizeTime,
   setLastTransTime,
   setSummaryContent,
   setSummaryError,
-  setSummaryStatus
+  setSummaryStatus,
+  setReviewAction,
+  setTempData
 } from '../redux/envReducer'
 import {
   LANGUAGE_DEFAULT,
   LANGUAGES_MAP,
-  MODEL_DEFAULT,
   PROMPT_DEFAULTS,
+  PROMPT_TYPE_ASK,
   PROMPT_TYPE_TRANSLATE,
   SUMMARIZE_LANGUAGE_DEFAULT,
   SUMMARIZE_THRESHOLD,
@@ -24,7 +27,7 @@ import {
 } from '../const'
 import toast from 'react-hot-toast'
 import {useMemoizedFn} from 'ahooks/es'
-import {extractJsonArray, extractJsonObject} from '../util/biz_util'
+import {extractJsonArray, extractJsonObject, getModel} from '../util/biz_util'
 import {formatTime} from '../util/util'
 
 const useTranslate = () => {
@@ -37,6 +40,9 @@ const useTranslate = () => {
   const language = LANGUAGES_MAP[envData.language??LANGUAGE_DEFAULT]
   const summarizeLanguage = LANGUAGES_MAP[envData.summarizeLanguage??SUMMARIZE_LANGUAGE_DEFAULT]
   const title = useAppSelector(state => state.env.title)
+  const reviewed = useAppSelector(state => state.env.tempData.reviewed)
+  const reviewAction = useAppSelector(state => state.env.reviewAction)
+  const reviewActions = useAppSelector(state => state.env.tempData.reviewActions)
 
   /**
    * 获取下一个需要翻译的行
@@ -82,23 +88,39 @@ const useTranslate = () => {
         prompt = prompt.replaceAll('{{subtitles}}', lineStr)
 
         const taskDef: TaskDef = {
-          type: 'chatComplete',
+          type: envData.aiType === 'gemini'?'geminiChatComplete':'chatComplete',
           serverUrl: envData.serverUrl,
-          data: {
+          data: envData.aiType === 'gemini'
-            model: envData.model??MODEL_DEFAULT,
+            ?{
-            messages: [
+                contents: [
-              {
+                  {
-                role: 'user',
+                    parts: [
-                content: prompt,
+                      {
+                        text: prompt
+                      }
+                    ]
+                  }
+                ],
+                generationConfig: {
+                  maxOutputTokens: 2048
+                }
               }
-            ],
+            :{
-            temperature: 0,
+                model: getModel(envData),
-            n: 1,
+                messages: [
-            stream: false,
+                  {
-          },
+                    role: 'user',
+                    content: prompt,
+                  }
+                ],
+                temperature: 0.25,
+                n: 1,
+                stream: false,
+              },
           extra: {
             type: 'translate',
             apiKey: envData.apiKey,
+            geminiApiKey: envData.geminiApiKey,
             startIdx,
             size: lines.length,
           }
@@ -117,10 +139,18 @@ const useTranslate = () => {
         dispatch(addTaskId(task.id))
       }
     }
-  }, [data?.body, dispatch, envData.apiKey, envData.fetchAmount, envData.serverUrl, envData.prompts, title, language.name])
+  }, [data?.body, envData, language.name, title, dispatch])
 
   const addSummarizeTask = useCallback(async (type: SummaryType, segment: Segment) => {
-    if (segment.text.length >= SUMMARIZE_THRESHOLD && envData.apiKey) {
+    //review action
+    if (reviewed === undefined && !reviewAction) {
+      dispatch(setReviewAction(true))
+      dispatch(setTempData({
+        reviewActions: (reviewActions ?? 0) + 1
+      }))
+    }
+
+    if (segment.text.length >= SUMMARIZE_THRESHOLD) {
       let subtitles = ''
       for (const item of segment.items) {
         subtitles += formatTime(item.from) + ' ' + item.content + '\n'
@@ -135,25 +165,41 @@ const useTranslate = () => {
       prompt = prompt.replaceAll('{{segment}}', segment.text)
 
       const taskDef: TaskDef = {
-        type: 'chatComplete',
+        type: envData.aiType === 'gemini'?'geminiChatComplete':'chatComplete',
         serverUrl: envData.serverUrl,
-        data: {
+        data: envData.aiType === 'gemini'
-          model: envData.model??MODEL_DEFAULT,
+          ?{
-          messages: [
+              contents: [
-            {
+                {
-              role: 'user',
+                  parts: [
-              content: prompt,
+                    {
+                      text: prompt
+                    }
+                  ]
+                }
+              ],
+              generationConfig: {
+                maxOutputTokens: 2048
+              }
             }
-          ],
+          :{
-          temperature: 0,
+              model: getModel(envData),
-          n: 1,
+              messages: [
-          stream: false,
+                {
-        },
+                  role: 'user',
+                  content: prompt,
+                }
+              ],
+              temperature: 0.5,
+              n: 1,
+              stream: false,
+            },
         extra: {
           type: 'summarize',
           summaryType: type,
           startIdx: segment.startIdx,
           apiKey: envData.apiKey,
+          geminiApiKey: envData.geminiApiKey,
         }
       }
       console.debug('addSummarizeTask', taskDef)
@@ -162,7 +208,64 @@ const useTranslate = () => {
       const task = await chrome.runtime.sendMessage({type: 'addTask', taskDef})
       dispatch(addTaskId(task.id))
     }
-  }, [dispatch, envData.apiKey, envData.prompts, envData.serverUrl, summarizeLanguage.name, title])
+  }, [dispatch, envData, summarizeLanguage.name, title])
+
+  const addAskTask = useCallback(async (id: string, segment: Segment, question: string) => {
+    if (segment.text.length >= SUMMARIZE_THRESHOLD) {
+      let prompt: string = envData.prompts?.[PROMPT_TYPE_ASK]??PROMPT_DEFAULTS[PROMPT_TYPE_ASK]
+      // replace params
+      prompt = prompt.replaceAll('{{language}}', summarizeLanguage.name)
+      prompt = prompt.replaceAll('{{title}}', title??'')
+      prompt = prompt.replaceAll('{{segment}}', segment.text)
+      prompt = prompt.replaceAll('{{question}}', question)
+
+      const taskDef: TaskDef = {
+        type: envData.aiType === 'gemini'?'geminiChatComplete':'chatComplete',
+        serverUrl: envData.serverUrl,
+        data: envData.aiType === 'gemini'
+          ?{
+              contents: [
+                {
+                  parts: [
+                    {
+                      text: prompt
+                    }
+                  ]
+                }
+              ],
+              generationConfig: {
+                maxOutputTokens: 2048
+              }
+            }
+          :{
+              model: getModel(envData),
+              messages: [
+                {
+                  role: 'user',
+                  content: prompt,
+                }
+              ],
+              temperature: 0.5,
+              n: 1,
+              stream: false,
+            },
+        extra: {
+          type: 'ask',
+          // startIdx: segment.startIdx,
+          apiKey: envData.apiKey,
+          geminiApiKey: envData.geminiApiKey,
+          askId: id,
+        }
+      }
+      console.debug('addAskTask', taskDef)
+      dispatch(mergeAskInfo({
+        id,
+        status: 'pending'
+      }))
+      const task = await chrome.runtime.sendMessage({type: 'addTask', taskDef})
+      dispatch(addTaskId(task.id))
+    }
+  }, [dispatch, envData, summarizeLanguage.name, title])
 
   const handleTranslate = useMemoizedFn((task: Task, content: string) => {
     let map: {[key: string]: string} = {}
@@ -215,13 +318,24 @@ const useTranslate = () => {
     console.debug('setSummary', task.def.extra.startIdx, summaryType, obj, task.error)
   })
 
+  const handleAsk = useMemoizedFn((task: Task, content?: string) => {
+    dispatch(mergeAskInfo({
+      id: task.def.extra.askId,
+      content,
+      status: 'done',
+      error: task.error,
+    }))
+
+    console.debug('setAsk', content, task.error)
+  })
+
   const getTask = useCallback(async (taskId: string) => {
     const taskResp = await chrome.runtime.sendMessage({type: 'getTask', taskId})
     if (taskResp.code === 'ok') {
       console.debug('getTask', taskResp.task)
       const task: Task = taskResp.task
       const taskType: string | undefined = task.def.extra?.type
-      const content = task.resp?.choices?.[0]?.message?.content?.trim()
+      const content = envData.aiType === 'gemini'?task.resp?.candidates[0]?.content?.parts[0]?.text?.trim():task.resp?.choices?.[0]?.message?.content?.trim()
       if (task.status === 'done') {
         // 异常提示
         if (task.error) {
@@ -234,14 +348,16 @@ const useTranslate = () => {
           handleTranslate(task, content)
         } else if (taskType === 'summarize') { // 总结
           handleSummarize(task, content)
+        } else if (taskType === 'ask') { // 总结
+          handleAsk(task, content)
         }
       }
     } else {
       dispatch(delTaskId(taskId))
     }
-  }, [dispatch, handleSummarize, handleTranslate])
+  }, [dispatch, envData.aiType, handleAsk, handleSummarize, handleTranslate])
 
-  return {getFetch, getTask, addTask, addSummarizeTask}
+  return {getFetch, getTask, addTask, addSummarizeTask, addAskTask}
 }
 
 export default useTranslate

src/redux/envReducer.ts

@@ -1,7 +1,7 @@
 import {createSlice, PayloadAction} from '@reduxjs/toolkit'
-import {find} from 'lodash-es'
+import {find, findIndex} from 'lodash-es'
 import {getDevData} from '../util/biz_util'
-import {SERVER_URL_OPENAI, TOTAL_HEIGHT_DEF} from '../const'
+import {DEFAULT_SERVER_URL_OPENAI, TOTAL_HEIGHT_DEF} from '../const'
 
 interface EnvState {
   envData: EnvData
@@ -17,7 +17,6 @@ interface EnvState {
   autoScroll?: boolean
   checkAutoScroll?: boolean
   curOffsetTop?: number
-  compact?: boolean // 是否紧凑视图
   floatKeyPointsSegIdx?: number // segment的startIdx
 
   noVideo?: boolean
@@ -25,13 +24,13 @@ interface EnvState {
   curIdx?: number // 从0开始
   needScroll?: boolean
   currentTime?: number
-  downloadType?: string
   infos?: any[]
   curInfo?: any
   curFetched?: boolean
   data?: Transcript
   uploadedTranscript?: Transcript
   segments?: Segment[]
+  url?: string
   title?: string
 
   taskIds?: string[]
@@ -39,13 +38,24 @@ interface EnvState {
   lastTransTime?: number
   lastSummarizeTime?: number
 
+  // ask
+  asks: AskInfo[]
+
+  /**
+   * 是否输入中（中文）
+   */
+  inputting: boolean
+
   searchText: string
   searchResult: Set<number>
+
+  //当前视频是否计算过操作
+  reviewAction: boolean
 }
 
 const initialState: EnvState = {
   envData: {
-    serverUrl: SERVER_URL_OPENAI,
+    serverUrl: DEFAULT_SERVER_URL_OPENAI,
     translateEnable: true,
     summarizeEnable: true,
     autoExpand: true,
@@ -64,8 +74,14 @@ const initialState: EnvState = {
   data: import.meta.env.VITE_ENV === 'web-dev' ? getDevData() : undefined,
   transResults: {},
 
+  inputting: false,
+
   searchText: '',
   searchResult: new Set(),
+
+  asks: [],
+
+  reviewAction: false,
 }
 
 export const slice = createSlice({
@@ -81,12 +97,15 @@ export const slice = createSlice({
     setEnvReady: (state) => {
       state.envReady = true
     },
-    setTempData: (state, action: PayloadAction<TempData>) => {
+    setTempData: (state, action: PayloadAction<Partial<TempData>>) => {
       state.tempData = {
         ...state.tempData,
         ...action.payload,
       }
     },
+    setReviewAction: (state, action: PayloadAction<boolean>) => {
+      state.reviewAction = action.payload
+    },
     setTempReady: (state) => {
       state.tempReady = true
     },
@@ -102,9 +121,6 @@ export const slice = createSlice({
     setFoldAll: (state, action: PayloadAction<boolean>) => {
       state.foldAll = action.payload
     },
-    setCompact: (state, action: PayloadAction<boolean>) => {
-      state.compact = action.payload
-    },
     setPage: (state, action: PayloadAction<string | undefined>) => {
       state.page = action.payload
     },
@@ -200,6 +216,21 @@ export const slice = createSlice({
         }
       }
     },
+    addAskInfo: (state, action: PayloadAction<AskInfo>) => {
+      state.asks.push(action.payload)
+    },
+    delAskInfo: (state, action: PayloadAction<string>) => {
+      state.asks = state.asks.filter(ask => ask.id !== action.payload)
+    },
+    mergeAskInfo: (state, action: PayloadAction<PartialOfAskInfo>) => {
+      const idx = findIndex(state.asks, {id: action.payload.id})
+      if (idx >= 0) {
+        state.asks[idx] = {
+          ...state.asks[idx],
+          ...action.payload,
+        }
+      }
+    },
     setSegmentFold: (state, action: PayloadAction<{
       segmentStartIdx: number
       fold: boolean
@@ -230,15 +261,15 @@ export const slice = createSlice({
     setNoVideo: (state, action: PayloadAction<boolean>) => {
       state.noVideo = action.payload
     },
-    setDownloadType: (state, action: PayloadAction<string>) => {
-      state.downloadType = action.payload
-    },
     setNeedScroll: (state, action: PayloadAction<boolean>) => {
       state.needScroll = action.payload
     },
     setCurrentTime: (state, action: PayloadAction<number | undefined>) => {
       state.currentTime = action.payload
     },
+    setUrl: (state, action: PayloadAction<string | undefined>) => {
+      state.url = action.payload
+    },
     setTitle: (state, action: PayloadAction<string | undefined>) => {
       state.title = action.payload
     },
@@ -263,10 +294,14 @@ export const slice = createSlice({
     setFold: (state, action: PayloadAction<boolean>) => {
       state.fold = action.payload
     },
+    setInputting: (state, action: PayloadAction<boolean>) => {
+      state.inputting = action.payload
+    },
   },
 })
 
 export const {
+  setUrl,
   setTempReady,
   setTempData,
   setUploadedTranscript,
@@ -275,7 +310,6 @@ export const {
   setCurOffsetTop,
   setFloatKeyPointsSegIdx,
   setFoldAll,
-  setCompact,
   setSegmentFold,
   setSummaryContent,
   setSummaryStatus,
@@ -290,10 +324,10 @@ export const {
   addTaskId,
   delTaskId,
   setTaskIds,
-  setDownloadType,
   setAutoTranslate,
   setAutoScroll,
   setNoVideo,
+  setReviewAction,
   setNeedScroll,
   setCurIdx,
   setEnvData,
@@ -306,6 +340,10 @@ export const {
   setFold,
   setSearchText,
   setSearchResult,
+  setInputting,
+  addAskInfo,
+  delAskInfo,
+  mergeAskInfo,
 } = slice.actions
 
 export default slice.reducer

src/typings.d.ts

@@ -1,9 +1,17 @@
 interface EnvData {
   autoExpand?: boolean
   flagDot?: boolean
+
+  aiType?: 'openai' | 'gemini'
+  // openai
   apiKey?: string
   serverUrl?: string
   model?: string
+  customModel?: string
+  customModelTokens?: number
+  // gemini
+  geminiApiKey?: string
+
   translateEnable?: boolean
   language?: string
   hideOnDisableAutoTranslate?: boolean
@@ -20,6 +28,9 @@ interface EnvData {
   searchEnabled?: boolean
   cnSearchEnabled?: boolean
 
+  // ask
+  askEnabled?: boolean
+
   prompts?: {
     [key: string]: string
   }
@@ -27,10 +38,14 @@ interface EnvData {
 
 interface TempData {
   curSummaryType: SummaryType
+  downloadType?: string
+  compact?: boolean // 是否紧凑视图
+  reviewActions?: number // 点击或总结行为达到一定次数后，显示评分（一个视频最多只加1次）
+  reviewed?: boolean // 是否点击过评分,undefined: 不显示；true: 已点击；false: 未点击(需要显示)
 }
 
 interface TaskDef {
-  type: 'chatComplete'
+  type: 'chatComplete' | 'geminiChatComplete'
   serverUrl?: string
   data: any
   extra?: any
@@ -92,6 +107,17 @@ interface Summary {
   content?: any
 }
 
+interface AskInfo {
+  id: string
+  fold?: boolean
+  question: string
+  status: SummaryStatus
+  error?: string
+  content?: string
+}
+
+type PartialOfAskInfo = Partial<PartOfAskInfo>
+
 /**
  * 概览
  */
@@ -116,4 +142,4 @@ interface BriefSummary extends Summary {
 }
 
 type SummaryStatus = 'init' | 'pending' | 'done'
-type SummaryType = 'overview' | 'keypoint' | 'brief'
+type SummaryType = 'overview' | 'keypoint' | 'brief' | 'question'

src/util/biz_util.ts

@@ -1,5 +1,5 @@
 import devData from '../data/data.json'
-import {APP_DOM_ID, SUMMARIZE_TYPES} from '../const'
+import {APP_DOM_ID, CUSTOM_MODEL_TOKENS, MODEL_DEFAULT, MODEL_MAP, SUMMARIZE_TYPES} from '../const'
 import {isDarkMode} from '@kky002/kky-util'
 import toast from 'react-hot-toast'
 import {findIndex} from 'lodash-es'
@@ -88,6 +88,9 @@ export const isSummaryEmpty = (summary: Summary) => {
   } else if (summary.type === 'brief') {
     const content: string[] = summary.content??''
     return content.length === 0
+  } else if (summary.type === 'question') {
+    const content: any[] = summary.content??[]
+    return content.length === 0
   }
   return true
 }
@@ -109,6 +112,11 @@ export const getSummaryStr = (summary: Summary) => {
       summary: ''
     }
     s += content.summary + '\n'
+  } else if (summary.type === 'question') {
+    const content: Array<{ q: string, a: string }> = summary.content ?? []
+    s += content.map(item => {
+      return item.q + '\n' + item.a + '\n'
+    }).join('\n')
   }
   return s
 }
@@ -123,6 +131,22 @@ export const getServerUrl = (serverUrl?: string) => {
   return serverUrl
 }
 
+export const getModel = (envData: EnvData) => {
+  if (envData.model === 'custom') {
+    return envData.customModel
+  } else {
+    return envData.model
+  }
+}
+
+export const getModelMaxTokens = (envData: EnvData) => {
+  if (envData.model === 'custom') {
+    return envData.customModelTokens??CUSTOM_MODEL_TOKENS
+  } else {
+    return MODEL_MAP[envData.model??MODEL_DEFAULT]?.tokens??4000
+  }
+}
+
 export const setTheme = (theme: EnvData['theme']) => {
   const appRoot = document.getElementById(APP_DOM_ID)
   if (appRoot != null) {
@@ -253,7 +277,15 @@ export const extractJsonObject = (content: string) => {
   const start = content.indexOf('```')
   const end = content.lastIndexOf('```')
   if (start >= 0 && end >= 0) {
-    content = content.slice(start + 3, end)
+    if (start === end) { // 异常情况
+      if (content.startsWith('```')) {
+        content = content.slice(3)
+      } else {
+        content = content.slice(0, -3)
+      }
+    } else {
+      content = content.slice(start + 3, end)
+    }
   }
   // get content between { and }
   const start2 = content.indexOf('{')
@@ -269,7 +301,15 @@ export const extractJsonArray = (content: string) => {
   const start = content.indexOf('```')
   const end = content.lastIndexOf('```')
   if (start >= 0 && end >= 0) {
-    content = content.slice(start + 3, end)
+    if (start === end) { // 异常情况
+      if (content.startsWith('```')) {
+        content = content.slice(3)
+      } else {
+        content = content.slice(0, -3)
+      }
+    } else {
+      content = content.slice(start + 3, end)
+    }
   }
   // get content between [ and ]
   const start3 = content.indexOf('[')

src/vite-env.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="vite/client" />
 
 interface ImportMetaEnv {
+  readonly VITE_REVIEW_URL: string
+  readonly VITE_EXTENSION_ID: string
 }
 
 interface ImportMeta {

tailwind.config.cjs

@@ -18,11 +18,13 @@ module.exports = {
       light: {
         ...require("daisyui/src/colors/themes")["[data-theme=light]"],
         "--rounded-btn": "0.15rem",
+        "primary": "rgb(0, 174, 236)",
       },
     }, {
       dark: {
         ...require("daisyui/src/colors/themes")["[data-theme=dark]"],
         "--rounded-btn": "0.15rem",
+        "primary": "rgb(0, 174, 236)",
       }
     }],
     base: true,

vite.config.ts

@@ -12,7 +12,7 @@ export default ({mode}) => {
     visualizer() as PluginOption,
   ]
   // @ts-ignore
-  if (mode === 'production_chrome') {
+  if (mode === 'production_chrome' || mode === 'production_edge') {
     plugins.push(crx({
       manifest,
     }))

vite.config.ts.timestamp-1705728659971.mjs

@@ -0,0 +1,66 @@
+// vite.config.ts
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
+import { visualizer } from "rollup-plugin-visualizer";
+import { crx } from "@crxjs/vite-plugin";
+
+// manifest.json
+var manifest_default = {
+  name: "\u54D4\u54E9\u54D4\u54E9\u5B57\u5E55\u5217\u8868",
+  description: "\u663E\u793AB\u7AD9\u89C6\u9891\u7684\u5B57\u5E55\u5217\u8868,\u53EF\u70B9\u51FB\u8DF3\u8F6C\u4E0E\u4E0B\u8F7D\u5B57\u5E55,\u5E76\u652F\u6301\u7FFB\u8BD1\u548C\u603B\u7ED3\u5B57\u5E55!",
+  version: "1.7.11",
+  manifest_version: 3,
+  permissions: [
+    "storage"
+  ],
+  background: {
+    service_worker: "src/chrome/background.ts"
+  },
+  content_scripts: [
+    {
+      matches: ["https://www.bilibili.com/video/*", "https://www.bilibili.com/list/*"],
+      js: ["src/chrome/content-script.cjs"]
+    }
+  ],
+  icons: {
+    "16": "favicon-16x16.png",
+    "32": "favicon-32x32.png",
+    "48": "favicon-48x48.png",
+    "128": "favicon-128x128.png"
+  },
+  action: {
+    default_popup: "index.html",
+    default_icon: {
+      "16": "favicon-16x16.png",
+      "32": "favicon-32x32.png",
+      "48": "favicon-48x48.png",
+      "128": "favicon-128x128.png"
+    }
+  }
+};
+
+// vite.config.ts
+var vite_config_default = ({ mode }) => {
+  const plugins = [
+    react(),
+    visualizer()
+  ];
+  if (mode === "production_chrome") {
+    plugins.push(crx({
+      manifest: manifest_default
+    }));
+  }
+  return defineConfig({
+    base: "/",
+    plugins,
+    css: {
+      modules: {
+        localsConvention: "camelCase"
+      }
+    }
+  });
+};
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvVXNlcnMvZmVuZ3l1ZXhpYW5nL2RhdGEvcHJvamVjdC9iaWxpYmlsaS1zdWJ0aXRsZVwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL2Zlbmd5dWV4aWFuZy9kYXRhL3Byb2plY3QvYmlsaWJpbGktc3VidGl0bGUvdml0ZS5jb25maWcudHNcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfaW1wb3J0X21ldGFfdXJsID0gXCJmaWxlOi8vL1VzZXJzL2Zlbmd5dWV4aWFuZy9kYXRhL3Byb2plY3QvYmlsaWJpbGktc3VidGl0bGUvdml0ZS5jb25maWcudHNcIjtpbXBvcnQge2RlZmluZUNvbmZpZywgUGx1Z2luT3B0aW9ufSBmcm9tICd2aXRlJ1xuaW1wb3J0IHJlYWN0IGZyb20gJ0B2aXRlanMvcGx1Z2luLXJlYWN0J1xuaW1wb3J0IHt2aXN1YWxpemVyfSBmcm9tIFwicm9sbHVwLXBsdWdpbi12aXN1YWxpemVyXCI7XG5pbXBvcnQge2NyeH0gZnJvbSAnQGNyeGpzL3ZpdGUtcGx1Z2luJ1xuLy8gQHRzLWlnbm9yZVxuaW1wb3J0IG1hbmlmZXN0IGZyb20gJy4vbWFuaWZlc3QuanNvbidcblxuLy8gaHR0cHM6Ly92aXRlanMuZGV2L2NvbmZpZy9cbmV4cG9ydCBkZWZhdWx0ICh7bW9kZX0pID0+IHtcbiAgY29uc3QgcGx1Z2lucyA9IFtcbiAgICByZWFjdCgpLFxuICAgIHZpc3VhbGl6ZXIoKSBhcyBQbHVnaW5PcHRpb24sXG4gIF1cbiAgLy8gQHRzLWlnbm9yZVxuICBpZiAobW9kZSA9PT0gJ3Byb2R1Y3Rpb25fY2hyb21lJykge1xuICAgIHBsdWdpbnMucHVzaChjcngoe1xuICAgICAgbWFuaWZlc3QsXG4gICAgfSkpXG4gIH1cbiAgcmV0dXJuIGRlZmluZUNvbmZpZyh7XG4gICAgYmFzZTogJy8nLFxuICAgIHBsdWdpbnMsXG4gICAgY3NzOiB7XG4gICAgICBtb2R1bGVzOiB7XG4gICAgICAgIGxvY2Fsc0NvbnZlbnRpb246IFwiY2FtZWxDYXNlXCJcbiAgICAgIH1cbiAgICB9XG4gIH0pXG59XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQXdVLFNBQVEsb0JBQWlDO0FBQ2pYLE9BQU8sV0FBVztBQUNsQixTQUFRLGtCQUFpQjtBQUN6QixTQUFRLFdBQVU7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBS2xCLElBQU8sc0JBQVEsQ0FBQyxFQUFDLEtBQUksTUFBTTtBQUN6QixRQUFNLFVBQVU7QUFBQSxJQUNkLE1BQU07QUFBQSxJQUNOLFdBQVc7QUFBQSxFQUNiO0FBRUEsTUFBSSxTQUFTLHFCQUFxQjtBQUNoQyxZQUFRLEtBQUssSUFBSTtBQUFBLE1BQ2Y7QUFBQSxJQUNGLENBQUMsQ0FBQztBQUFBLEVBQ0o7QUFDQSxTQUFPLGFBQWE7QUFBQSxJQUNsQixNQUFNO0FBQUEsSUFDTjtBQUFBLElBQ0EsS0FBSztBQUFBLE1BQ0gsU0FBUztBQUFBLFFBQ1Asa0JBQWtCO0FBQUEsTUFDcEI7QUFBQSxJQUNGO0FBQUEsRUFDRixDQUFDO0FBQ0g7IiwKICAibmFtZXMiOiBbXQp9Cg==