Merge pull request #259 from sasjs/issue-258

Issue 258

.gitignore

@@ -3,4 +3,6 @@ build
 
 .env
 
-/coverage
+/coverage
+
+.DS_Store

src/SASViyaApiClient.ts

@@ -884,9 +884,7 @@ export class SASViyaApiClient {
       waitForResult,
       pollOptions,
       printPid
-    ).catch((err) => {
-      throw prefixMessage(err, 'Error while executing script. ')
-    })
+    )
   }
 
   /**

src/job-execution/ComputeJobExecutor.ts

@@ -20,35 +20,52 @@ export class ComputeJobExecutor extends BaseJobExecutor {
     const waitForResult = true
     const expectWebout = true
 
-    return this.sasViyaApiClient
-      ?.executeComputeJob(
-        sasJob,
-        config.contextName,
-        config.debug,
-        data,
-        accessToken,
-        waitForResult,
-        expectWebout
-      )
-      .then((response) => {
-        this.appendRequest(response, sasJob, config.debug)
-        let responseJson
+    const requestPromise = new Promise((resolve, reject) => {
+      this.sasViyaApiClient
+        ?.executeComputeJob(
+          sasJob,
+          config.contextName,
+          config.debug,
+          data,
+          accessToken,
+          waitForResult,
+          expectWebout
+        )
+        .then((response) => {
+          this.appendRequest(response, sasJob, config.debug)
 
-        return response.result
+          resolve(response.result)
+        })
+        .catch(async (e: Error) => {
+          if (e instanceof ComputeJobExecutionError) {
+            this.appendRequest(e, sasJob, config.debug)
 
-        return responseJson
-      })
-      .catch(async (e: Error) => {
-        if (e instanceof ComputeJobExecutionError) {
-          this.appendRequest(e, sasJob, config.debug)
-        }
-        if (e instanceof LoginRequiredError) {
-          await loginCallback()
-          this.appendWaitingRequest(() =>
-            this.execute(sasJob, data, config, loginRequiredCallback)
-          )
-        }
-        return Promise.reject(new ErrorResponse(e?.message, e))
-      })
+            reject(new ErrorResponse(e?.message, e))
+          }
+
+          if (e instanceof LoginRequiredError) {
+            await loginCallback()
+            this.appendWaitingRequest(() => {
+              return this.execute(
+                sasJob,
+                data,
+                config,
+                loginRequiredCallback
+              ).then(
+                (res: any) => {
+                  resolve(res)
+                },
+                (err: any) => {
+                  reject(err)
+                }
+              )
+            })
+          } else {
+            reject(new ErrorResponse(e?.message, e))
+          }
+        })
+    })
+
+    return requestPromise
   }
 }

src/job-execution/JesJobExecutor.ts

@@ -17,24 +17,52 @@ export class JesJobExecutor extends BaseJobExecutor {
     accessToken?: string
   ) {
     const loginCallback = loginRequiredCallback || (() => Promise.resolve())
-    return await this.sasViyaApiClient
-      ?.executeJob(sasJob, config.contextName, config.debug, data, accessToken)
-      .then((response) => {
-        this.appendRequest(response, sasJob, config.debug)
 
-        return response.result
-      })
-      .catch(async (e: Error) => {
-        if (e instanceof JobExecutionError) {
-          this.appendRequest(e, sasJob, config.debug)
-        }
-        if (e instanceof LoginRequiredError) {
-          await loginCallback()
-          this.appendWaitingRequest(() =>
-            this.execute(sasJob, data, config, loginRequiredCallback)
-          )
-        }
-        return Promise.reject(new ErrorResponse(e?.message, e))
-      })
+    const requestPromise = new Promise((resolve, reject) => {
+      this.sasViyaApiClient
+        ?.executeJob(
+          sasJob,
+          config.contextName,
+          config.debug,
+          data,
+          accessToken
+        )
+        .then((response) => {
+          this.appendRequest(response, sasJob, config.debug)
+
+          resolve(response.result)
+        })
+        .catch(async (e: Error) => {
+          if (e instanceof JobExecutionError) {
+            this.appendRequest(e, sasJob, config.debug)
+
+            reject(new ErrorResponse(e?.message, e))
+          }
+
+          if (e instanceof LoginRequiredError) {
+            await loginCallback()
+
+            this.appendWaitingRequest(() => {
+              return this.execute(
+                sasJob,
+                data,
+                config,
+                loginRequiredCallback
+              ).then(
+                (res: any) => {
+                  resolve(res)
+                },
+                (err: any) => {
+                  reject(err)
+                }
+              )
+            })
+          } else {
+            reject(new ErrorResponse(e?.message, e))
+          }
+        })
+    })
+
+    return requestPromise
   }
 }

src/job-execution/WebJobExecutor.ts

@@ -7,6 +7,11 @@ import { SASViyaApiClient } from '../SASViyaApiClient'
 import { isRelativePath } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
 
+export interface WaitingRequstPromise {
+  promise: Promise<any> | null
+  resolve: any
+  reject: any
+}
 export class WebJobExecutor extends BaseJobExecutor {
   constructor(
     serverUrl: string,
@@ -80,30 +85,51 @@ export class WebJobExecutor extends BaseJobExecutor {
       }
     }
 
-    return this.requestClient!.post(apiUrl, formData, undefined)
-      .then(async (res) => {
-        if (this.serverType === ServerType.SasViya && config.debug) {
-          const jsonResponse = await this.parseSasViyaDebugResponse(
-            res.result as string
-          )
+    const requestPromise = new Promise((resolve, reject) => {
+      this.requestClient!.post(apiUrl, formData, undefined)
+        .then(async (res) => {
+          if (this.serverType === ServerType.SasViya && config.debug) {
+            const jsonResponse = await this.parseSasViyaDebugResponse(
+              res.result as string
+            )
+            this.appendRequest(res, sasJob, config.debug)
+            resolve(jsonResponse)
+          }
           this.appendRequest(res, sasJob, config.debug)
-          return jsonResponse
-        }
-        this.appendRequest(res, sasJob, config.debug)
-        return res.result
-      })
-      .catch(async (e: Error) => {
-        if (e instanceof JobExecutionError) {
-          this.appendRequest(e, sasJob, config.debug)
-        }
-        if (e instanceof LoginRequiredError) {
-          await loginCallback()
-          this.appendWaitingRequest(() =>
-            this.execute(sasJob, data, config, loginRequiredCallback)
-          )
-        }
-        return Promise.reject(new ErrorResponse(e?.message, e))
-      })
+          resolve(res.result)
+        })
+        .catch(async (e: Error) => {
+          if (e instanceof JobExecutionError) {
+            this.appendRequest(e, sasJob, config.debug)
+
+            reject(new ErrorResponse(e?.message, e))
+          }
+
+          if (e instanceof LoginRequiredError) {
+            await loginCallback()
+
+            this.appendWaitingRequest(() => {
+              return this.execute(
+                sasJob,
+                data,
+                config,
+                loginRequiredCallback
+              ).then(
+                (res: any) => {
+                  resolve(res)
+                },
+                (err: any) => {
+                  reject(err)
+                }
+              )
+            })
+          } else {
+            reject(new ErrorResponse(e?.message, e))
+          }
+        })
+    })
+
+    return requestPromise
   }
 
   private parseSasViyaDebugResponse = async (response: string) => {

src/request/RequestClient.ts

@@ -5,6 +5,7 @@ import { LoginRequiredError } from '../types'
 import { AuthorizeError } from '../types/AuthorizeError'
 import { NotFoundError } from '../types/NotFoundError'
 import { parseWeboutResponse } from '../utils/parseWeboutResponse'
+import { prefixMessage } from '@sasjs/utils/error'
 
 export interface HttpClient {
   get<T>(
@@ -97,7 +98,9 @@ export class RequestClient implements HttpClient {
       .catch(async (e) => {
         return await this.handleError(e, () =>
           this.get<T>(url, accessToken, contentType, overrideHeaders)
-        )
+        ).catch((err) => {
+          throw prefixMessage(err, 'Error while handling error. ')
+        })
       })
   }
 
@@ -331,35 +334,59 @@ export class RequestClient implements HttpClient {
 
   private handleError = async (e: any, callback: any) => {
     const response = e.response as AxiosResponse
+
     if (e instanceof AuthorizeError) {
-      const res = await this.httpClient.get(e.confirmUrl, {
-        responseType: 'text',
-        headers: { 'Content-Type': 'text/plain', Accept: '*/*' }
-      })
+      const res = await this.httpClient
+        .get(e.confirmUrl, {
+          responseType: 'text',
+          headers: { 'Content-Type': 'text/plain', Accept: '*/*' }
+        })
+        .catch((err) => {
+          throw prefixMessage(err, 'Error while getting error confirmUrl. ')
+        })
 
       if (isAuthorizeFormRequired(res?.data as string)) {
-        await this.authorize(res.data as string)
+        await this.authorize(res.data as string).catch((err) => {
+          throw prefixMessage(err, 'Error while authorizing request. ')
+        })
       }
-      return await callback()
+
+      return await callback().catch((err: any) => {
+        throw prefixMessage(
+          err,
+          'Error while executing callback in handleError. '
+        )
+      })
     }
+
     if (e instanceof LoginRequiredError) {
       this.clearCsrfTokens()
     }
+
     if (response?.status === 403 || response?.status === 449) {
       this.parseAndSetCsrfToken(response)
+
       if (this.csrfToken.headerName && this.csrfToken.value) {
-        return await callback()
+        return await callback().catch((err: any) => {
+          throw prefixMessage(
+            err,
+            'Error while executing callback in handleError. '
+          )
+        })
       }
+
       throw e
     } else if (response?.status === 404) {
       throw new NotFoundError(response.config.url!)
     }
+
     throw e
   }
 
-  private async parseResponse<T>(response: AxiosResponse<any>) {
+  private parseResponse<T>(response: AxiosResponse<any>) {
     const etag = response?.headers ? response.headers['etag'] : ''
     let parsedResponse
+    let includeSAS9Log: boolean = false
 
     try {
       if (typeof response.data === 'string') {
@@ -373,11 +400,20 @@ export class RequestClient implements HttpClient {
       } catch {
         parsedResponse = response.data
       }
+
+      includeSAS9Log = true
     }
-    return {
+
+    let responseToReturn: { result: T; etag: any; log?: string } = {
       result: parsedResponse as T,
       etag
     }
+
+    if (includeSAS9Log) {
+      responseToReturn.log = response.data
+    }
+
+    return responseToReturn
   }
 }
 

src/test/SessionManager.spec.ts

@@ -29,7 +29,10 @@ describe('SessionManager', () => {
         Promise.resolve({ data: sampleResponse })
       )
 
-      const expectedResponse = { etag: '', result: sampleResponse }
+      const expectedResponse = {
+        etag: '',
+        result: sampleResponse
+      }
 
       await expect(
         sessionManager.getVariable(