Fix bugs (#1274)

* handle client error ref #1255 * use bugsnag & remove unhandled modal * fix upload storage * fix assessment play origin * upgrade deps * try to fix JavaScript heap out of memory when package * update github action * fix workflow * try to fix CI in linux
ZuodaoTech · Jan 15, 2025 · 33a0b9e · 33a0b9e
1 parent 931bfeb
commit 33a0b9e
Show file tree

Hide file tree

Showing 23 changed files with 1,222 additions and 591 deletions.
diff --git a/.github/workflows/test-enjoy-app.yml b/.github/workflows/test-enjoy-app.yml
@@ -43,7 +43,18 @@ jobs:
           brew install sdl2
 
       - name: Package App
-        run: yarn enjoy:package
+        shell: bash
+        env:
+          NODE_OPTIONS: "--max-old-space-size=8192"
+        run: |
+          set -e
+          yarn enjoy:package
+
+      - name: Configure Chrome sandbox for Linux
+        if: contains(matrix.os, 'ubuntu')
+        run: |
+          sudo chown root:root enjoy/out/Enjoy-linux-x64/chrome-sandbox
+          sudo chmod 4755 enjoy/out/Enjoy-linux-x64/chrome-sandbox
 
       - name: Run main tests with xvfb-run on Ubuntu
         # continue-on-error: true

diff --git a/1000-hours/package.json b/1000-hours/package.json
@@ -9,7 +9,7 @@
     "markdown-it-sub": "^2.0.0",
     "markdown-it-sup": "^2.0.0",
     "mermaid": "^11.4.1",
-    "sass": "^1.83.1",
+    "sass": "^1.83.4",
     "vitepress": "^1.5.0",
     "vitepress-plugin-mermaid": "^2.0.17",
     "vue": "^3.5.13"

diff --git a/1000h-portal/package.json b/1000h-portal/package.json
@@ -10,16 +10,16 @@
     "postinstall": "nuxt prepare"
   },
   "dependencies": {
-    "@nuxtjs/seo": "^2.0.2",
+    "@nuxtjs/seo": "^2.0.3",
     "nuxt": "^3.15.1",
-    "nuxt-og-image": "^4.0.2",
+    "nuxt-og-image": "^4.0.3",
     "vue": "^3.5.13",
     "vue-router": "^4.5.0"
   },
   "devDependencies": {
     "autoprefixer": "^10.4.20",
-    "postcss": "^8.4.49",
-    "sass": "^1.83.1",
+    "postcss": "^8.5.1",
+    "sass": "^1.83.4",
     "tailwindcss": "^3.4.17"
   }
 }
diff --git a/enjoy/package.json b/enjoy/package.json
@@ -11,16 +11,17 @@
     "predev": "yarn run download",
     "dev": "rimraf .vite && yarn run download && WEB_API_URL=http://localhost:3000 WS_URL=ws://localhost:3000 SETTINGS_PATH=${PWD}/enjoy/tmp LIBRARY_PATH=${PWD}/enjoy/tmp electron-forge start",
     "start": "rimraf .vite && yarn run download && electron-forge start",
-    "package": "rimraf .vite && yarn run download && electron-forge package",
-    "make": "rimraf .vite && yarn run download && electron-forge make",
-    "publish": "rimraf .vite && yarn run download && electron-forge publish",
+    "package": "NODE_OPTIONS='--max-old-space-size=8192' rimraf .vite && yarn run download && electron-forge package",
+    "make": "NODE_OPTIONS='--max-old-space-size=8192' rimraf .vite && yarn run download && electron-forge make",
+    "publish": "NODE_OPTIONS='--max-old-space-size=8192' rimraf .vite && yarn run download && electron-forge publish",
     "lint": "eslint --ext .ts,.tsx .",
     "test": "yarn run package && yarn run playwright test",
     "test:main": "yarn run playwright test e2e/main.spec.ts",
     "test:renderer": "yarn run playwright test e2e/renderer.spec.ts",
     "create-migration": "zx ./src/main/db/create-migration.mjs",
     "download-dictionaries": "zx ./scripts/download-dictionaries.mjs",
-    "download": "yarn run download-dictionaries"
+    "download": "yarn run download-dictionaries",
+    "sourcemap": "bugsnag-source-maps upload-node --directory .vite/build --app-version 0.7.6"
   },
   "keywords": [],
   "author": {
@@ -29,6 +30,7 @@
   },
   "license": "MIT",
   "devDependencies": {
+    "@bugsnag/source-maps": "^2.3.3",
     "@divisey/js-mdict": "^5.0.0",
     "@electron-forge/cli": "^7.6.0",
     "@electron-forge/maker-deb": "^7.6.0",
@@ -44,7 +46,7 @@
     "@electron/fuses": "^1.8.0",
     "@hookform/resolvers": "^3.10.0",
     "@langchain/community": "^0.3.24",
-    "@langchain/core": "^0.3.29",
+    "@langchain/core": "^0.3.30",
     "@langchain/ollama": "^0.1.4",
     "@mozilla/readability": "^0.5.0",
     "@playwright/test": "^1.49.1",
@@ -85,7 +87,7 @@
     "@types/mark.js": "^8.11.12",
     "@types/mime-types": "^2.1.4",
     "@types/mustache": "^4.2.5",
-    "@types/node": "^22.10.5",
+    "@types/node": "^22.10.6",
     "@types/prop-types": "^15.7.14",
     "@types/rails__actioncable": "^6.1.11",
     "@types/react": "^18.3.18",
@@ -95,8 +97,8 @@
     "@types/unzipper": "^0.10.10",
     "@types/validator": "^13.12.2",
     "@types/wavesurfer.js": "^6.0.12",
-    "@typescript-eslint/eslint-plugin": "^8.19.1",
-    "@typescript-eslint/parser": "^8.19.1",
+    "@typescript-eslint/eslint-plugin": "^8.20.0",
+    "@typescript-eslint/parser": "^8.20.0",
     "@uidotdev/usehooks": "^2.4.1",
     "@vidstack/react": "^1.12.12",
     "@vitejs/plugin-react": "^4.3.4",
@@ -119,14 +121,13 @@
     "decamelize": "^6.0.0",
     "decamelize-keys": "^2.0.1",
     "dependencies-tree": "^2.0.0",
-    "electron": "^33.3.1",
+    "electron": "^34.0.0",
     "electron-context-menu": "^4.0.4",
-    "electron-devtools-installer": "^3.2.1",
+    "electron-devtools-installer": "^4.0.0",
     "electron-forge-plugin-dependencies": "^1.0.0",
     "electron-log": "^5.2.4",
     "electron-playwright-helpers": "^1.7.1",
     "electron-squirrel-startup": "^1.0.1",
-    "electron-unhandled": "^5.0.0",
     "eslint": "^9.18.0",
     "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-import": "^2.31.0",
@@ -141,23 +142,22 @@
     "langchain": "^0.3.11",
     "lodash": "^4.17.21",
     "lru-cache": "^11.0.2",
-    "lucide-react": "^0.471.0",
+    "lucide-react": "^0.471.1",
     "mark.js": "^8.11.1",
     "media-captions": "^0.0.18",
     "microsoft-cognitiveservices-speech-sdk": "^1.42.0",
     "mime-types": "^2.1.35",
     "mustache": "^4.2.0",
-    "new-github-issue-url": "^1.0.0",
     "next-themes": "^0.4.4",
     "octokit": "^4.1.0",
     "openai": "^4.78.1",
     "pitchfinder": "^2.3.2",
-    "postcss": "^8.4.49",
+    "postcss": "^8.5.1",
     "progress": "^2.0.3",
     "prop-types": "^15.8.1",
     "proxy-agent": "^6.5.0",
     "react": "^18.3.1",
-    "react-activity-calendar": "^2.7.6",
+    "react-activity-calendar": "^2.7.7",
     "react-audio-visualize": "^1.2.0",
     "react-audio-voice-recorder": "^2.2.0",
     "react-dom": "^18.3.1",
@@ -176,7 +176,7 @@
     "sonner": "^1.7.1",
     "tailwind-merge": "^2.6.0",
     "tailwind-scrollbar": "^3.1.0",
-    "tailwind-scrollbar-hide": "^1.3.1",
+    "tailwind-scrollbar-hide": "^2.0.0",
     "tailwindcss": "^3.4.17",
     "tailwindcss-animate": "^1.0.7",
     "ts-node": "^10.9.2",
@@ -185,13 +185,15 @@
     "typescript": "^5.7.3",
     "vite": "^6.0.7",
     "vite-plugin-static-copy": "^2.2.0",
-    "wavesurfer.js": "^7.8.15",
+    "wavesurfer.js": "^7.8.16",
     "zod": "^3.24.1",
     "zod-to-json-schema": "^3.24.1",
     "zx": "^8.3.0"
   },
   "dependencies": {
     "@andrkrn/ffprobe-static": "^5.2.0",
+    "@bugsnag/electron": "^8.1.2",
+    "@bugsnag/plugin-react": "^8.1.1",
     "echogarden": "^1.8.7",
     "electron-settings": "^4.0.4",
     "ffmpeg-static": "^5.2.0",

diff --git a/enjoy/src/constants/index.ts b/enjoy/src/constants/index.ts
@@ -118,3 +118,15 @@ export const AGENT_FIXTURE_ANDREW = {
     ttsVoice: "en-US-AndrewNeural",
   },
 };
+
+export const BUGSNAG_API_KEY = "828ee1de10c079a250be7fd05177662f";
+
+export const MIME_TYPES: Record<string, string> = {
+  ".mp3": "audio/mpeg",
+  ".wav": "audio/wav",
+  ".ogg": "audio/ogg",
+  ".m4a": "audio/mp4",
+  ".aac": "audio/aac",
+  ".flac": "audio/flac",
+  ".wma": "audio/x-ms-wma",
+};
diff --git a/enjoy/src/main.ts b/enjoy/src/main.ts
@@ -1,20 +1,22 @@
-import { app, BrowserWindow, protocol, net, shell } from "electron";
+import { app, BrowserWindow, protocol, net } from "electron";
 import path from "path";
 import fs from "fs-extra";
 import settings from "@main/settings";
 import log from "@main/logger";
 import mainWindow from "@main/window";
 import ElectronSquirrelStartup from "electron-squirrel-startup";
 import contextMenu from "electron-context-menu";
+import Bugsnag from "@bugsnag/electron";
 import { t } from "i18next";
-import unhandled from "electron-unhandled";
-import newGithubIssueUrl from "new-github-issue-url";
+import { BUGSNAG_API_KEY } from "./constants";
 
 const logger = log.scope("main");
 
 app.commandLine.appendSwitch("enable-features", "SharedArrayBuffer");
 
-if (!app.isPackaged) {
+if (app.isPackaged) {
+  Bugsnag.start({ apiKey: BUGSNAG_API_KEY });
+} else {
   app.disableHardwareAcceleration();
   app.commandLine.appendSwitch("disable-software-rasterizer");
 }
@@ -121,43 +123,6 @@ app.on("ready", async () => {
   });
 
   mainWindow.init();
-
-  unhandled({
-    showDialog: true,
-    logger: logger.error,
-    reportButton: (error) => {
-      const url = newGithubIssueUrl({
-        user: "ZuodaoTech",
-        repo: "everyone-can-use-english",
-        title: "Unhandled Error",
-        body: `
-## Node.js error stack
-
-**Message:** 
-
-\`\`\`
-${error.message}
-\`\`\`
-
-**Stack:** 
-
-\`\`\`
-${error.stack}
-\`\`\`
-
-**Environment:**
-
-\`\`\`
-${app.name} ${app.getVersion()}
-Electron ${process.versions.electron}
-${process.platform} ${process.arch}
-Locale: ${app.getLocale()}
-\`\`\``,
-      });
-
-      shell.openExternal(url);
-    },
-  });
 });
 
 // Quit when all windows are closed, except on macOS. There, it's common

diff --git a/enjoy/src/main/db/models/audio.ts b/enjoy/src/main/db/models/audio.ts
@@ -21,7 +21,7 @@ import {
   Video,
 } from "@main/db/models";
 import settings from "@main/settings";
-import { AudioFormats, VideoFormats } from "@/constants";
+import { AudioFormats, MIME_TYPES, VideoFormats } from "@/constants";
 import { hashFile } from "@main/utils";
 import path from "path";
 import fs from "fs-extra";
@@ -159,6 +159,14 @@ export class Audio extends Model<Audio> {
     return this.getDataValue("md5") + this.extname;
   }
 
+  get mimeType(): string {
+    if (this.metadata?.mimeType) {
+      return this.metadata.mimeType;
+    }
+
+    return MIME_TYPES[this.extname.toLowerCase()] || "audio/mpeg";
+  }
+
   get extname(): string {
     return (
       this.getDataValue("metadata")?.extname ||
@@ -204,7 +212,7 @@ export class Audio extends Model<Audio> {
     if (this.isUploaded && !force) return;
 
     return storage
-      .put(this.md5, this.filePath)
+      .put(this.md5, this.filePath, this.mimeType)
       .then((result) => {
         logger.debug("upload result:", result.data);
         if (result.data.success) {

diff --git a/enjoy/src/main/db/models/document.ts b/enjoy/src/main/db/models/document.ts
@@ -146,7 +146,7 @@ export class Document extends Model<Document> {
     if (this.isUploaded && !force) return;
 
     return storage
-      .put(this.md5, this.filePath)
+      .put(this.md5, this.filePath, this.metadata.mimeType)
       .then((result) => {
         logger.debug("upload result:", result.data);
         if (result.data.success) {

diff --git a/enjoy/src/main/db/models/note.ts b/enjoy/src/main/db/models/note.ts
@@ -97,7 +97,9 @@ export class Note extends Model<Note> {
 
   @AfterCreate
   static syncAndUploadAfterCreate(note: Note) {
-    note.sync();
+    note.sync().catch((err) => {
+      logger.error("sync note error", note.id, err);
+    });
   }
 
   @AfterCreate
@@ -113,7 +115,7 @@ export class Note extends Model<Note> {
   @AfterUpdate
   static syncAfterUpdate(note: Note) {
     note.sync().catch((err) => {
-      logger.error("sync error", err);
+      logger.error("sync note error", note.id, err);
     });
   }
 

diff --git a/enjoy/src/main/db/models/recording.ts b/enjoy/src/main/db/models/recording.ts
@@ -34,6 +34,7 @@ import { t } from "i18next";
 import { Attributes, Op, Transaction } from "sequelize";
 import { v5 as uuidv5 } from "uuid";
 import FfmpegWrapper from "@main/ffmpeg";
+import { MIME_TYPES } from "@/constants";
 
 const logger = log.scope("db/models/recording");
 
@@ -141,6 +142,15 @@ export class Recording extends Model<Recording> {
     )}`;
   }
 
+  @Column(DataType.VIRTUAL)
+  get mimeType(): string {
+    return MIME_TYPES[this.extname.toLowerCase()] || "audio/mpeg";
+  }
+
+  get extname(): string {
+    return path.extname(this.filePath);
+  }
+
   get filePath(): string {
     const file = path.join(
       settings.userDataPath(),
@@ -169,7 +179,7 @@ export class Recording extends Model<Recording> {
     }
 
     return storage
-      .put(this.md5, this.filePath)
+      .put(this.md5, this.filePath, this.mimeType)
       .then((result) => {
         logger.debug("upload result:", result.data);
         if (result.data.success) {