improve api/client

enjoy/src/api/client.ts

@@ -7,10 +7,16 @@ const ONE_MINUTE = 1000 * 60; // 1 minute
 export class Client {
   public api: AxiosInstance;
   public baseUrl: string;
+  public logger: any;
 
-  constructor(options: { baseUrl: string; accessToken?: string }) {
-    const { baseUrl, accessToken } = options;
+  constructor(options: {
+    baseUrl: string;
+    accessToken?: string;
+    logger?: any;
+  }) {
+    const { baseUrl, accessToken, logger } = options;
     this.baseUrl = baseUrl;
+    this.logger = logger || console;
 
     this.api = axios.create({
       baseURL: baseUrl,
@@ -22,7 +28,7 @@ export class Client {
     this.api.interceptors.request.use((config) => {
       config.headers.Authorization = `Bearer ${accessToken}`;
 
-      console.debug(
+      this.logger.debug(
         config.method.toUpperCase(),
         config.baseURL + config.url,
         config.data,
@@ -32,7 +38,7 @@ export class Client {
     });
     this.api.interceptors.response.use(
       (response) => {
-        console.debug(
+        this.logger.debug(
           response.status,
           response.config.method.toUpperCase(),
           response.config.baseURL + response.config.url
@@ -41,19 +47,19 @@ export class Client {
       },
       (err) => {
         if (err.response) {
-          console.error(
+          this.logger.error(
             err.response.status,
             err.response.config.method.toUpperCase(),
             err.response.config.baseURL + err.response.config.url
           );
-          console.error(err.response.data);
+          this.logger.error(err.response.data);
           return Promise.reject(err.response.data);
         }
 
         if (err.request) {
-          console.error(err.request);
+          this.logger.error(err.request);
         } else {
-          console.error(err.message);
+          this.logger.error(err.message);
         }
 
         return Promise.reject(err);
@@ -153,7 +159,7 @@ export class Client {
       sourceId?: string;
       sourceType?: string;
     }[]
-  ): Promise<{ successCount: number; errors: string[], total: number }> {
+  ): Promise<{ successCount: number; errors: string[]; total: number }> {
     return this.api.post("/api/lookups/batch", {
       lookups: decamelizeKeys(lookups, { deep: true }),
     });

enjoy/src/main/db/models/audio.ts

@@ -37,6 +37,7 @@ const logger = log.scope("db/models/audio");
 const webApi = new Client({
   baseUrl: process.env.WEB_API_URL || WEB_API_URL,
   accessToken: settings.getSync("user.accessToken") as string,
+  logger: log.scope("api/client"),
 });
 
 @Table({

enjoy/src/main/db/models/pronunciation-assessment.ts

@@ -17,13 +17,14 @@ import { Recording } from "@main/db/models";
 import { Client } from "@/api";
 import { WEB_API_URL } from "@/constants";
 import settings from "@main/settings";
+import log from "electron-log/main";
 
 const webApi = new Client({
   baseUrl: process.env.WEB_API_URL || WEB_API_URL,
   accessToken: settings.getSync("user.accessToken") as string,
+  logger: log.scope("api/client"),
 });
 
-
 @Table({
   modelName: "PronunciationAssessment",
   tableName: "pronunciation_assessments",

enjoy/src/main/db/models/recording.ts

@@ -33,6 +33,7 @@ const logger = log.scope("db/models/recording");
 const webApi = new Client({
   baseUrl: process.env.WEB_API_URL || WEB_API_URL,
   accessToken: settings.getSync("user.accessToken") as string,
+  logger: log.scope("api/client"),
 });
 
 @Table({

enjoy/src/main/db/models/transcription.ts

@@ -24,6 +24,7 @@ const logger = log.scope("db/models/transcription");
 const webApi = new Client({
   baseUrl: process.env.WEB_API_URL || WEB_API_URL,
   accessToken: settings.getSync("user.accessToken") as string,
+  logger: log.scope("api/client"),
 });
 
 @Table({

enjoy/src/main/db/models/video.ts

@@ -37,6 +37,7 @@ const logger = log.scope("db/models/video");
 const webApi = new Client({
   baseUrl: process.env.WEB_API_URL || WEB_API_URL,
   accessToken: settings.getSync("user.accessToken") as string,
+  logger: log.scope("api/client"),
 });
 
 @Table({