Merge branch 'dev'

Author: ylxmf2005

.github/workflows/build.yml

@@ -135,27 +135,18 @@ jobs:
       - name: Compile & release Electron app
         uses: samuelmeuli/action-electron-builder@v1
         env:
-          # AWS Credentials for S3 publishing
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: ${{ secrets.AWS_REGION }} # Use the region secret
-          # GitHub Token for creating GitHub releases (if still needed)
+          # GitHub Token for creating GitHub releases
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VITE_APP_VERSION: ${{ needs.draft.outputs.version }}
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           build_script_name: build
-          args: --config electron-builder.yml --publish always # Ensure publishing is triggered
-          # release: true # Set to false if you ONLY want to publish to S3 and not create a GitHub Release artifact
+          args: --config electron-builder.yml
           max_attempts: 3
 
   build_web:
     needs: [draft]
     runs-on: ubuntu-latest
-    env:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      AWS_REGION: ${{ secrets.AWS_REGION }}
 
     steps:
       - uses: actions/checkout@v3
@@ -177,22 +168,6 @@ jobs:
           zip -r ../../open-llm-vtuber-web-${{ needs.draft.outputs.version }}.zip .
           cd ../.. # Go back to the workspace root
 
-      - name: Upload Web App Zip to S3
-        run: |
-          aws s3 cp ./open-llm-vtuber-web-${{ needs.draft.outputs.version }}.zip s3://open-llm-vtuber-frontend/open-llm-vtuber-web-${{ needs.draft.outputs.version }}.zip
-          echo "Web app zip uploaded. Public access depends on S3 bucket policy/settings."
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_REGION }}
-
-      - name: Upload web build to S3
-        run: |
-          aws s3 sync ./dist/web s3://open-llm-vtuber-frontend/web --delete
-
       - name: Deploy to GitHub Pages
         uses: JamesIves/github-pages-deploy-action@v4
         with:

src/renderer/WebSDK/src/lappadapter.ts

@@ -70,7 +70,7 @@ export class LAppAdapter {
   }
 
   public getExpressionName(index: number): string {
-    return this.getModel()?._modelSetting.getExpressionName(index);
+    return this.getModel()?._modelSetting?.getExpressionName(index) ?? '';
   }
 
   public setExpression(name: string): void {

src/renderer/src/components/canvas/live2d.tsx

@@ -56,26 +56,26 @@ export const Live2D = memo(
     }, [aiState, modelInfo, resetExpression]);
 
     // Expose setExpression for console testing
-    useEffect(() => {
-      const testSetExpression = (expressionValue: string | number) => {
-        const lappAdapter = (window as any).getLAppAdapter?.();
-        if (lappAdapter) {
-          setExpression(expressionValue, lappAdapter, `[Console Test] Set expression to: ${expressionValue}`);
-        } else {
-          console.error('[Console Test] LAppAdapter not found.');
-        }
-      };
+    // useEffect(() => {
+    //   const testSetExpression = (expressionValue: string | number) => {
+    //     const lappAdapter = (window as any).getLAppAdapter?.();
+    //     if (lappAdapter) {
+    //       setExpression(expressionValue, lappAdapter, `[Console Test] Set expression to: ${expressionValue}`);
+    //     } else {
+    //       console.error('[Console Test] LAppAdapter not found.');
+    //     }
+    //   };
 
-      // Expose the function to the window object
-      (window as any).testSetExpression = testSetExpression;
-      console.log('[Debug] testSetExpression function exposed to window.');
+    //   // Expose the function to the window object
+    //   (window as any).testSetExpression = testSetExpression;
+    //   console.log('[Debug] testSetExpression function exposed to window.');
 
-      // Cleanup function to remove the function from window when the component unmounts
-      return () => {
-        delete (window as any).testSetExpression;
-        console.log('[Debug] testSetExpression function removed from window.');
-      };
-    }, [setExpression]);
+    //   // Cleanup function to remove the function from window when the component unmounts
+    //   return () => {
+    //     delete (window as any).testSetExpression;
+    //     console.log('[Debug] testSetExpression function removed from window.');
+    //   };
+    // }, [setExpression]);
 
     const handlePointerDown = (e: React.PointerEvent) => {
       handlers.onMouseDown(e);

src/renderer/src/hooks/canvas/use-live2d-expression.ts

@@ -47,6 +47,13 @@ export const useLive2DExpression = () => {
     if (!lappAdapter) return;
 
     try {
+      // Check if model is loaded and has expressions
+      const model = lappAdapter.getModel();
+      if (!model || !model._modelSetting) {
+        console.log('Model or model settings not loaded yet, skipping expression reset');
+        return;
+      }
+
       // If model has a default emotion defined, use it
       if (modelInfo?.defaultEmotion !== undefined) {
         setExpression(
@@ -55,13 +62,16 @@ export const useLive2DExpression = () => {
           `Reset expression to default: ${modelInfo.defaultEmotion}`,
         );
       } else {
-        // If no default is defined, use the first expression (index 0)
-        const defaultExpressionName = lappAdapter.getExpressionName(0);
-        if (defaultExpressionName) {
-          setExpression(
-            defaultExpressionName,
-            lappAdapter,
-          );
+        // Check if model has any expressions before trying to get the first one
+        const expressionCount = lappAdapter.getExpressionCount();
+        if (expressionCount > 0) {
+          const defaultExpressionName = lappAdapter.getExpressionName(0);
+          if (defaultExpressionName) {
+            setExpression(
+              defaultExpressionName,
+              lappAdapter,
+            );
+          }
         }
       }
     } catch (error) {