lobehub
diff --git a/‎src/features/AgentViewer/ToolBar/index.tsx
Lines changed: 1 addition & 1 deletion b/‎src/features/AgentViewer/ToolBar/index.tsx
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/features/AgentViewer/index.tsx
Lines changed: 3 additions & 15 deletions b/‎src/features/AgentViewer/index.tsx
Lines changed: 3 additions & 15 deletions
diff --git a/‎src/features/messages/speakCharacter.ts
Lines changed: 1 addition & 2 deletions b/‎src/features/messages/speakCharacter.ts
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/hooks/useLoadModel.tsx
Lines changed: 17 additions & 13 deletions b/‎src/hooks/useLoadModel.tsx
Lines changed: 17 additions & 13 deletions
diff --git a/‎src/features/emoteController/autoBlink.ts renamed to ‎src/libs/emoteController/autoBlink.ts b/‎src/features/emoteController/autoBlink.ts renamed to ‎src/libs/emoteController/autoBlink.ts
diff --git a/‎src/features/emoteController/autoLookAt.ts renamed to ‎src/libs/emoteController/autoLookAt.ts b/‎src/features/emoteController/autoLookAt.ts renamed to ‎src/libs/emoteController/autoLookAt.ts
diff --git a/‎src/features/emoteController/emoteConstants.ts renamed to ‎src/libs/emoteController/emoteConstants.ts b/‎src/features/emoteController/emoteConstants.ts renamed to ‎src/libs/emoteController/emoteConstants.ts
diff --git a/‎src/features/emoteController/emoteController.ts renamed to ‎src/libs/emoteController/emoteController.ts b/‎src/features/emoteController/emoteController.ts renamed to ‎src/libs/emoteController/emoteController.ts
diff --git a/‎src/features/emoteController/expressionController.ts renamed to ‎src/libs/emoteController/expressionController.ts b/‎src/features/emoteController/expressionController.ts renamed to ‎src/libs/emoteController/expressionController.ts
diff --git a/‎src/features/lipSync/lipSync.ts renamed to ‎src/libs/lipSync/lipSync.ts b/‎src/features/lipSync/lipSync.ts renamed to ‎src/libs/lipSync/lipSync.ts
@@ -4,7 +4,7 @@ import { Aperture, Axis3D, Grid3x3, Orbit, Power, SwitchCamera } from 'lucide-re
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Viewer } from '@/features/vrmViewer/viewer';
+import { Viewer } from '@/libs/vrmViewer/viewer';
 
 interface ToolBarProps {
   className?: string;
 
@@ -7,8 +7,6 @@ import PageLoading from '@/components/PageLoading';
 import { useLoadModel } from '@/hooks/useLoadModel';
 import { useGlobalStore } from '@/store/global';
 import { Agent } from '@/types/agent';
-import { getModelPathByAgentId } from '@/utils/file';
-import storage from '@/utils/storage';
 
 import ToolBar from './ToolBar';
 import { useStyles } from './style';
@@ -28,24 +26,14 @@ function AgentViewer(props: Props) {
   const viewer = useGlobalStore((s) => s.viewer);
   const { t } = useTranslation('features');
 
-  const { downloading, percent, fetchModelBlob } = useLoadModel();
+  const { downloading, percent, fetchModelUrl } = useLoadModel();
 
   const canvasRef = useCallback(
     (canvas: HTMLCanvasElement) => {
       if (canvas) {
         viewer.setup(canvas);
-        const modelPath = getModelPathByAgentId(agent.agentId);
-        storage.getItem(modelPath).then((blob) => {
-          if (!blob) {
-            viewer.unloadVRM();
-            fetchModelBlob(agent.agentId, agent.meta.model!).then((res) => {
-              if (res) {
-                const modelUrl = URL.createObjectURL(res);
-                viewer.loadVrm(modelUrl);
-              }
-            });
-          } else {
-            const modelUrl = URL.createObjectURL(blob as Blob);
+        fetchModelUrl(agent.agentId, agent.meta.model!).then((modelUrl) => {
+          if (modelUrl) {
             viewer.loadVrm(modelUrl);
           }
         });
 
@@ -1,9 +1,8 @@
+import { Viewer } from '@/libs/vrmViewer/viewer';
 import { speechApi } from '@/services/tts';
 import { Screenplay } from '@/types/touch';
 import { wait } from '@/utils/wait';
 
-import { Viewer } from '../vrmViewer/viewer';
-
 const createSpeakCharacter = () => {
   let lastTime = 0;
   let prevFetchPromise: Promise<unknown> = Promise.resolve();
 
@@ -8,30 +8,34 @@ export const useLoadModel = () => {
   const [downloading, setDownloading] = useState(false);
   const [percent, setPercent] = useState(0);
 
-  const fetchModelBlob = async (agentId: string, modelUrl: string) => {
-    setDownloading(true);
-    setPercent(0);
-    try {
-      const blob = await fetchWithProgress(modelUrl, {
-        onProgress: (loaded, total) => {
-          setPercent(Math.ceil((loaded / total) * 100));
-        },
-      });
-      const modelPath = getModelPathByAgentId(agentId);
-      await storage.setItem(modelPath, blob);
+  const fetchModelUrl = async (agentId: string, remoteModelUrl: string) => {
+    const localModelPath = getModelPathByAgentId(agentId);
+    let modelBlob = await storage.getItem(localModelPath);
 
-      return blob;
+    try {
+      if (!modelBlob) {
+        setDownloading(true);
+        setPercent(0);
+        const blob = await fetchWithProgress(remoteModelUrl, {
+          onProgress: (loaded, total) => {
+            setPercent(Math.ceil((loaded / total) * 100));
+          },
+        });
+        const modelPath = getModelPathByAgentId(agentId);
+        await storage.setItem(modelPath, blob);
+      }
     } catch (e) {
       console.error(e);
       return null;
     } finally {
       setDownloading(false);
     }
+    return URL.createObjectURL(modelBlob);
   };
 
   return {
     downloading,
     percent,
-    fetchModelBlob,
+    fetchModelUrl,
   };
 };