fix: rethrow axios errors to consumer

modelon-community · Sep 22, 2022 · 5222743 · 5222743
1 parent df898d0
commit 5222743
Showing 1 changed file with 34 additions and 49 deletions.
diff --git a/src/Client.ts b/src/Client.ts
@@ -225,17 +225,15 @@ export class Client {
 
     getWorkspaces(): Promise<Workspace[]> {
         return new Promise((resolve, reject) => {
-            try {
-                this.ensureImpactToken().then(() => {
+            this.ensureImpactToken()
+                .then(() => {
                     this.axios
                         .get(
                             `${this.baseUrl}${this.jhUserPath}impact/api/workspaces`
                         )
                         .then((response) => resolve(response.data?.data?.items))
                 })
-            } catch (e) {
-                reject(e)
-            }
+                .catch((e) => reject(e))
         })
     }
 
@@ -247,8 +245,8 @@ export class Client {
         workspaceId: string
     }): Promise<ExperimentId> {
         return new Promise((resolve, reject) => {
-            try {
-                this.ensureImpactToken().then(() => {
+            this.ensureImpactToken()
+                .then(() => {
                     this.axios
                         .post(
                             `${this.baseUrl}${this.jhUserPath}impact/api/workspaces/${workspaceId}/experiments`,
@@ -258,9 +256,7 @@ export class Client {
                             resolve(response.data.experiment_id)
                         )
                 })
-            } catch (e) {
-                reject(e)
-            }
+                .catch((e) => reject(e))
         })
     }
 
@@ -274,25 +270,22 @@ export class Client {
         workspaceId: string
     }): Promise<void> {
         return new Promise((resolve, reject) => {
-            try {
-                this.ensureImpactToken().then(() => {
-                    this.axios
-                        .post(
-                            `${this.baseUrl}${this.jhUserPath}/impact/api/workspaces/${workspaceId}/experiments/${experimentId}/execution`,
-                            {
-                                includeCases: {
-                                    ids: cases,
-                                },
-                                options: {
-                                    forceCompilation: true,
-                                },
-                            }
-                        )
-                        .then(() => resolve())
-                })
-            } catch (e) {
-                reject(e)
-            }
+            this.ensureImpactToken().then(() => {
+                this.axios
+                    .post(
+                        `${this.baseUrl}${this.jhUserPath}/impact/api/workspaces/${workspaceId}/experiments/${experimentId}/execution`,
+                        {
+                            includeCases: {
+                                ids: cases,
+                            },
+                            options: {
+                                forceCompilation: true,
+                            },
+                        }
+                    )
+                    .then(() => resolve())
+                    .catch((e) => reject(e))
+            })
         })
     }
 
@@ -304,17 +297,15 @@ export class Client {
         workspaceId: string
     }): Promise<CompilationStatus> {
         return new Promise((resolve, reject) => {
-            try {
-                this.ensureImpactToken().then(() => {
+            this.ensureImpactToken()
+                .then(() => {
                     this.axios
                         .get(
                             `${this.baseUrl}${this.jhUserPath}/impact/api/workspaces/${workspaceId}/experiments/${experimentId}/execution`
                         )
                         .then((response) => resolve(response.data))
                 })
-            } catch (e) {
-                reject(e)
-            }
+                .catch((e) => reject(e))
         })
     }
 
@@ -368,17 +359,15 @@ export class Client {
 
     getCustomFunctions(workspaceId: string): Promise<CustomFunction[]> {
         return new Promise((resolve, reject) => {
-            try {
-                this.ensureImpactToken().then(() => {
+            this.ensureImpactToken()
+                .then(() => {
                     this.axios
                         .get(
                             `${this.baseUrl}${this.jhUserPath}impact/api/workspaces/${workspaceId}/custom-functions`
                         )
                         .then((response) => resolve(response.data.data.items))
                 })
-            } catch (e) {
-                reject(e)
-            }
+                .catch((e) => reject(e))
         })
     }
 
@@ -390,17 +379,15 @@ export class Client {
         workspaceId: string
     }): Promise<Case[] | undefined> {
         return new Promise((resolve, reject) => {
-            try {
-                this.ensureImpactToken().then(() => {
+            this.ensureImpactToken()
+                .then(() => {
                     this.axios
                         .get(
                             `${this.baseUrl}${this.jhUserPath}impact/api/workspaces/${workspaceId}/experiments/${experimentId}/cases`
                         )
                         .then((response) => resolve(response.data?.data?.items))
                 })
-            } catch (e) {
-                reject(e)
-            }
+                .catch((e) => reject(e))
         })
     }
 
@@ -416,18 +403,16 @@ export class Client {
         workspaceId: string
     }): Promise<Trajectories | undefined> {
         return new Promise((resolve, reject) => {
-            try {
-                this.ensureImpactToken().then(() => {
+            this.ensureImpactToken()
+                .then(() => {
                     this.axios
                         .post(
                             `${this.baseUrl}${this.jhUserPath}impact/api/workspaces/${workspaceId}/experiments/${experimentId}/cases/${caseId}/trajectories`,
                             { variable_names: variableNames }
                         )
                         .then((res) => resolve(res.data))
                 })
-            } catch (e) {
-                reject(e)
-            }
+                .catch((e) => reject(e))
         })
     }
 }