From bf8f57cbdd149335336bcf58f8dc7fccb8b7f72e Mon Sep 17 00:00:00 2001
From: an-lee <an.lee.work@gmail.com>
Date: Sat, 20 Jul 2024 17:37:14 +0800
Subject: [PATCH] update web api url setup

---
 enjoy/src/main/db/models/audio.ts                    | 6 +++---
 enjoy/src/main/db/models/note.ts                     | 5 ++---
 enjoy/src/main/db/models/pronunciation-assessment.ts | 3 +--
 enjoy/src/main/db/models/recording.ts                | 5 ++---
 enjoy/src/main/db/models/segment.ts                  | 3 +--
 enjoy/src/main/db/models/speech.ts                   | 3 +--
 enjoy/src/main/db/models/transcription.ts            | 4 ++--
 enjoy/src/main/db/models/video.ts                    | 4 ++--
 enjoy/src/main/settings.ts                           | 8 +++++++-
 enjoy/src/main/window.ts                             | 5 ++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/enjoy/src/main/db/models/audio.ts b/enjoy/src/main/db/models/audio.ts
index 64c936d5..27357217 100644
--- a/enjoy/src/main/db/models/audio.ts
+++ b/enjoy/src/main/db/models/audio.ts
@@ -16,7 +16,7 @@ import {
 } from "sequelize-typescript";
 import { Recording, Speech, Transcription, Video } from "@main/db/models";
 import settings from "@main/settings";
-import { AudioFormats, VideoFormats, WEB_API_URL } from "@/constants";
+import { AudioFormats, VideoFormats } from "@/constants";
 import { hashFile } from "@main/utils";
 import path from "path";
 import fs from "fs-extra";
@@ -182,7 +182,7 @@ export class Audio extends Model<Audio> {
     if (this.isSynced) return;
 
     const webApi = new Client({
-      baseUrl: process.env.WEB_API_URL || WEB_API_URL,
+      baseUrl: settings.apiUrl(),
       accessToken: settings.getSync("user.accessToken") as string,
       logger: log.scope("audio/sync"),
     });
@@ -263,7 +263,7 @@ export class Audio extends Model<Audio> {
     });
 
     const webApi = new Client({
-      baseUrl: process.env.WEB_API_URL || WEB_API_URL,
+      baseUrl: settings.apiUrl(),
       accessToken: settings.getSync("user.accessToken") as string,
       logger: log.scope("audio/cleanupFile"),
     });
diff --git a/enjoy/src/main/db/models/note.ts b/enjoy/src/main/db/models/note.ts
index f91bb527..7d7ed25c 100644
--- a/enjoy/src/main/db/models/note.ts
+++ b/enjoy/src/main/db/models/note.ts
@@ -15,7 +15,6 @@ import {
 import mainWindow from "@main/window";
 import log from "@main/logger";
 import { Client } from "@/api";
-import { WEB_API_URL } from "@/constants";
 import settings from "@main/settings";
 import { Segment } from "@main/db/models";
 
@@ -61,7 +60,7 @@ export class Note extends Model<Note> {
     if (this.isSynced) return;
 
     const webApi = new Client({
-      baseUrl: process.env.WEB_API_URL || WEB_API_URL,
+      baseUrl: settings.apiUrl(),
       accessToken: settings.getSync("user.accessToken") as string,
       logger,
     });
@@ -121,7 +120,7 @@ export class Note extends Model<Note> {
   @AfterDestroy
   static destroyRemote(note: Note) {
     const webApi = new Client({
-      baseUrl: process.env.WEB_API_URL || WEB_API_URL,
+      baseUrl: settings.apiUrl(),
       accessToken: settings.getSync("user.accessToken") as string,
       logger,
     });
diff --git a/enjoy/src/main/db/models/pronunciation-assessment.ts b/enjoy/src/main/db/models/pronunciation-assessment.ts
index bc891cbc..65140776 100644
--- a/enjoy/src/main/db/models/pronunciation-assessment.ts
+++ b/enjoy/src/main/db/models/pronunciation-assessment.ts
@@ -16,7 +16,6 @@ import {
 import mainWindow from "@main/window";
 import { Recording } from "@main/db/models";
 import { Client } from "@/api";
-import { WEB_API_URL } from "@/constants";
 import settings from "@main/settings";
 import log from "@main/logger";
 
@@ -102,7 +101,7 @@ export class PronunciationAssessment extends Model<PronunciationAssessment> {
 
   async sync() {
     const webApi = new Client({
-      baseUrl: process.env.WEB_API_URL || WEB_API_URL,
+      baseUrl: settings.apiUrl(),
       accessToken: settings.getSync("user.accessToken") as string,
       logger: log.scope("api/client"),
     });
diff --git a/enjoy/src/main/db/models/recording.ts b/enjoy/src/main/db/models/recording.ts
index 3ddbc610..c44ae017 100644
--- a/enjoy/src/main/db/models/recording.ts
+++ b/enjoy/src/main/db/models/recording.ts
@@ -23,7 +23,6 @@ import { hashFile } from "@main/utils";
 import log from "@main/logger";
 import storage from "@main/storage";
 import { Client } from "@/api";
-import { WEB_API_URL } from "@/constants";
 import echogarden from "@main/echogarden";
 import { t } from "i18next";
 import { Attributes } from "sequelize";
@@ -144,7 +143,7 @@ export class Recording extends Model<Recording> {
     if (this.isSynced) return;
 
     const webApi = new Client({
-      baseUrl: process.env.WEB_API_URL || WEB_API_URL,
+      baseUrl: settings.apiUrl(),
       accessToken: settings.getSync("user.accessToken") as string,
       logger,
     });
@@ -238,7 +237,7 @@ export class Recording extends Model<Recording> {
   static cleanupFile(recording: Recording) {
     fs.remove(recording.filePath);
     const webApi = new Client({
-      baseUrl: process.env.WEB_API_URL || WEB_API_URL,
+      baseUrl: settings.apiUrl(),
       accessToken: settings.getSync("user.accessToken") as string,
       logger: log.scope("recording/cleanupFile"),
     });
diff --git a/enjoy/src/main/db/models/segment.ts b/enjoy/src/main/db/models/segment.ts
index 68bb9209..5993102f 100644
--- a/enjoy/src/main/db/models/segment.ts
+++ b/enjoy/src/main/db/models/segment.ts
@@ -17,7 +17,6 @@ import { Audio, Transcription, Video } from "@main/db/models";
 import mainWindow from "@main/window";
 import log from "@main/logger";
 import { Client } from "@/api";
-import { WEB_API_URL } from "@/constants";
 import settings from "@main/settings";
 import storage from "@/main/storage";
 import path from "path";
@@ -110,7 +109,7 @@ export class Segment extends Model<Segment> {
     if (this.isSynced) return;
 
     const webApi = new Client({
-      baseUrl: process.env.WEB_API_URL || WEB_API_URL,
+      baseUrl: settings.apiUrl(),
       accessToken: settings.getSync("user.accessToken") as string,
       logger,
     });
diff --git a/enjoy/src/main/db/models/speech.ts b/enjoy/src/main/db/models/speech.ts
index 1a60742a..244c67fd 100644
--- a/enjoy/src/main/db/models/speech.ts
+++ b/enjoy/src/main/db/models/speech.ts
@@ -23,7 +23,6 @@ import { t } from "i18next";
 import { hashFile } from "@main/utils";
 import { Audio, Message } from "@main/db/models";
 import log from "@main/logger";
-import { WEB_API_URL } from "@/constants";
 import proxyAgent from "@main/proxy-agent";
 
 const logger = log.scope("db/models/speech");
@@ -182,7 +181,7 @@ export class Speech extends Model<Speech> {
     if (engine === "enjoyai") {
       openaiConfig = {
         apiKey: settings.getSync("user.accessToken") as string,
-        baseURL: `${process.env.WEB_API_URL || WEB_API_URL}/api/ai`,
+        baseURL: `${settings.apiUrl()}/api/ai`,
       };
     } else if (engine === "openai") {
       const defaultConfig = settings.getSync("openai") as LlmProviderType;
diff --git a/enjoy/src/main/db/models/transcription.ts b/enjoy/src/main/db/models/transcription.ts
index cb807f32..49a55f1d 100644
--- a/enjoy/src/main/db/models/transcription.ts
+++ b/enjoy/src/main/db/models/transcription.ts
@@ -15,7 +15,7 @@ import { Audio, Video } from "@main/db/models";
 import mainWindow from "@main/window";
 import log from "@main/logger";
 import { Client } from "@/api";
-import { WEB_API_URL, PROCESS_TIMEOUT } from "@/constants";
+import { PROCESS_TIMEOUT } from "@/constants";
 import settings from "@main/settings";
 import { AlignmentResult } from "echogarden/dist/api/Alignment";
 
@@ -80,7 +80,7 @@ export class Transcription extends Model<Transcription> {
     if (this.getDataValue("state") !== "finished") return;
 
     const webApi = new Client({
-      baseUrl: process.env.WEB_API_URL || WEB_API_URL,
+      baseUrl: settings.apiUrl(),
       accessToken: settings.getSync("user.accessToken") as string,
       logger,
     });
diff --git a/enjoy/src/main/db/models/video.ts b/enjoy/src/main/db/models/video.ts
index d07357c1..3fb697cf 100644
--- a/enjoy/src/main/db/models/video.ts
+++ b/enjoy/src/main/db/models/video.ts
@@ -203,7 +203,7 @@ export class Video extends Model<Video> {
     if (this.isSynced) return;
 
     const webApi = new Client({
-      baseUrl: process.env.WEB_API_URL || WEB_API_URL,
+      baseUrl: settings.apiUrl(),
       accessToken: settings.getSync("user.accessToken") as string,
       logger,
     });
@@ -279,7 +279,7 @@ export class Video extends Model<Video> {
     });
 
     const webApi = new Client({
-      baseUrl: process.env.WEB_API_URL || WEB_API_URL,
+      baseUrl: settings.apiUrl(),
       accessToken: settings.getSync("user.accessToken") as string,
       logger: log.scope("video/cleanupFile"),
     });
diff --git a/enjoy/src/main/settings.ts b/enjoy/src/main/settings.ts
index ec507b72..e5b8f21b 100644
--- a/enjoy/src/main/settings.ts
+++ b/enjoy/src/main/settings.ts
@@ -1,5 +1,5 @@
 import settings from "electron-settings";
-import { LIBRARY_PATH_SUFFIX, DATABASE_NAME } from "@/constants";
+import { LIBRARY_PATH_SUFFIX, DATABASE_NAME, WEB_API_URL } from "@/constants";
 import { ipcMain, app } from "electron";
 import path from "path";
 import fs from "fs-extra";
@@ -92,6 +92,11 @@ const userDataPath = () => {
   return userData;
 };
 
+const apiUrl = () => {
+  const url: string = settings.getSync("apiUrl") as string;
+  return process.env.API_URL || url || WEB_API_URL;
+};
+
 export default {
   registerIpcHandlers: () => {
     ipcMain.handle("settings-get", (_event, key) => {
@@ -192,5 +197,6 @@ export default {
   whisperConfig,
   language,
   switchLanguage,
+  apiUrl,
   ...settings,
 };
diff --git a/enjoy/src/main/window.ts b/enjoy/src/main/window.ts
index 3abd811f..9f1eed27 100644
--- a/enjoy/src/main/window.ts
+++ b/enjoy/src/main/window.ts
@@ -16,7 +16,7 @@ import whisper from "@main/whisper";
 import fs from "fs-extra";
 import "@main/i18n";
 import log from "@main/logger";
-import { WEB_API_URL, REPO_URL, WS_URL } from "@/constants";
+import { REPO_URL, WS_URL } from "@/constants";
 import { AudibleProvider, TedProvider, YoutubeProvider } from "@main/providers";
 import Ffmpeg from "@main/ffmpeg";
 import { Waveform } from "./waveform";
@@ -315,8 +315,7 @@ main.init = () => {
   });
 
   ipcMain.handle("app-api-url", () => {
-    const apiUrl = settings.getSync("apiUrl");
-    return process.env.WEB_API_URL || apiUrl || WEB_API_URL;
+    return settings.apiUrl();
   });
 
   ipcMain.handle("app-ws-url", () => {