Merge pull request #259 from sasjs/issue-258

Issue 258

.gitignore

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

src/SASViyaApiClient.ts

@@ -21,6 +21,7 @@ import { isAuthorizeFormRequired } from './auth/isAuthorizeFormRequired'
 import { RequestClient } from './request/RequestClient'
 import { NotFoundError } from './types/NotFoundError'
 import { SasAuthResponse } from '@sasjs/utils/types'
+import { prefixMessage } from '@sasjs/utils/error'
 
 /**
  * A client for interfacing with the SAS Viya REST API.
@@ -280,25 +281,24 @@ export class SASViyaApiClient {
         'Content-Type': 'application/json'
       }
 
-      if (accessToken) {
-        headers.Authorization = `Bearer ${accessToken}`
-      }
+      if (accessToken) headers.Authorization = `Bearer ${accessToken}`
 
       let executionSessionId: string
+
       const session = await this.sessionManager
         .getSession(accessToken)
         .catch((err) => {
-          throw err
+          throw prefixMessage(err, 'Error while getting session. ')
         })
 
       executionSessionId = session!.id
 
       if (printPid) {
-        const { result: jobIdVariable } = await this.sessionManager.getVariable(
-          executionSessionId,
-          'SYSJOBID',
-          accessToken
-        )
+        const { result: jobIdVariable } = await this.sessionManager
+          .getVariable(executionSessionId, 'SYSJOBID', accessToken)
+          .catch((err) => {
+            throw prefixMessage(err, 'Error while getting session variable. ')
+          })
 
         if (jobIdVariable && jobIdVariable.value) {
           const relativeJobPath = this.rootFolderName
@@ -331,6 +331,7 @@ export class SASViyaApiClient {
       }
 
       let fileName
+
       if (isRelativePath(jobPath)) {
         fileName = `exec-${
           jobPath.includes('/') ? jobPath.split('/')[1] : jobPath
@@ -352,7 +353,7 @@ export class SASViyaApiClient {
       if (data) {
         if (JSON.stringify(data).includes(';')) {
           files = await this.uploadTables(data, accessToken).catch((err) => {
-            throw err
+            throw prefixMessage(err, 'Error while uploading tables. ')
           })
 
           jobVariables['_webin_file_count'] = files.length
@@ -376,19 +377,18 @@ export class SASViyaApiClient {
         variables: jobVariables,
         arguments: jobArguments
       }
+
       const { result: postedJob, etag } = await this.requestClient
         .post<Job>(
           `/compute/sessions/${executionSessionId}/jobs`,
           jobRequestBody,
           accessToken
         )
-        .catch((err: any) => {
-          throw err
+        .catch((err) => {
+          throw prefixMessage(err, 'Error while posting job. ')
         })
 
-      if (!waitForResult) {
-        return session
-      }
+      if (!waitForResult) return session
 
       if (debug) {
         console.log(`Job has been submitted for '${fileName}'.`)
@@ -404,7 +404,9 @@ export class SASViyaApiClient {
         etag,
         accessToken,
         pollOptions
-      )
+      ).catch((err) => {
+        throw prefixMessage(err, 'Error while polling job status. ')
+      })
 
       const { result: currentJob } = await this.requestClient
         .get<Job>(
@@ -412,7 +414,7 @@ export class SASViyaApiClient {
           accessToken
         )
         .catch((err) => {
-          throw err
+          throw prefixMessage(err, 'Error while getting job. ')
         })
 
       let jobResult
@@ -427,7 +429,7 @@ export class SASViyaApiClient {
             res.result.items.map((i: any) => i.line).join('\n')
           )
           .catch((err) => {
-            throw err
+            throw prefixMessage(err, 'Error while getting log. ')
           })
       }
 
@@ -455,7 +457,7 @@ export class SASViyaApiClient {
                     res.result.items.map((i: any) => i.line).join('\n')
                   )
                   .catch((err) => {
-                    throw err
+                    throw prefixMessage(err, 'Error while getting log. ')
                   })
 
                 return Promise.reject({
@@ -464,6 +466,7 @@ export class SASViyaApiClient {
                 })
               }
             }
+
             return {
               result: JSON.stringify(e)
             }
@@ -473,7 +476,7 @@ export class SASViyaApiClient {
       await this.sessionManager
         .clearSession(executionSessionId, accessToken)
         .catch((err) => {
-          throw err
+          throw prefixMessage(err, 'Error while clearing session. ')
         })
 
       return { result: jobResult?.result, log }
@@ -490,7 +493,7 @@ export class SASViyaApiClient {
           true
         )
       } else {
-        throw e
+        throw prefixMessage(e, 'Error while executing script. ')
       }
     }
   }
@@ -814,9 +817,12 @@ export class SASViyaApiClient {
       ? `${this.rootFolderName}/${folderPath}`
       : folderPath
 
-    await this.populateFolderMap(fullFolderPath, accessToken)
+    await this.populateFolderMap(fullFolderPath, accessToken).catch((err) => {
+      throw prefixMessage(err, 'Error while populating folder map. ')
+    })
 
     const jobFolder = this.folderMap.get(fullFolderPath)
+
     if (!jobFolder) {
       throw new Error(
         `The folder '${fullFolderPath}' was not found on '${this.serverUrl}'`
@@ -824,6 +830,7 @@ export class SASViyaApiClient {
     }
 
     const headers: any = { 'Content-Type': 'application/json' }
+
     if (!!accessToken) {
       headers.Authorization = `Bearer ${accessToken}`
     }
@@ -847,10 +854,14 @@ export class SASViyaApiClient {
 
       const {
         result: jobDefinition
-      } = await this.requestClient.get<JobDefinition>(
-        `${this.serverUrl}${jobDefinitionLink.href}`,
-        accessToken
-      )
+      } = await this.requestClient
+        .get<JobDefinition>(
+          `${this.serverUrl}${jobDefinitionLink.href}`,
+          accessToken
+        )
+        .catch((err) => {
+          throw prefixMessage(err, 'Error while getting job definition. ')
+        })
 
       code = jobDefinition.code
 
@@ -861,6 +872,7 @@ export class SASViyaApiClient {
     if (!code) code = ''
 
     const linesToExecute = code.replace(/\r\n/g, '\n').split('\n')
+
     return await this.executeScript(
       sasJob,
       linesToExecute,
@@ -1007,19 +1019,27 @@ export class SASViyaApiClient {
     }
 
     const url = '/folders/folders/@item?path=' + path
-    const { result: folder } = await this.requestClient.get<Folder>(
-      `${url}`,
-      accessToken
-    )
+    const { result: folder } = await this.requestClient
+      .get<Folder>(`${url}`, accessToken)
+      .catch((err) => {
+        throw prefixMessage(err, 'Error while getting folder. ')
+      })
+
     if (!folder) {
       throw new Error(`The path ${path} does not exist on ${this.serverUrl}`)
     }
-    const { result: members } = await this.requestClient.get<{ items: any[] }>(
-      `/folders/folders/${folder.id}/members?limit=${folder.memberCount}`,
-      accessToken
-    )
+
+    const { result: members } = await this.requestClient
+      .get<{ items: any[] }>(
+        `/folders/folders/${folder.id}/members?limit=${folder.memberCount}`,
+        accessToken
+      )
+      .catch((err) => {
+        throw prefixMessage(err, 'Error while getting members. ')
+      })
 
     const itemsAtRoot = members.items
+
     this.folderMap.set(path, itemsAtRoot)
   }
 
@@ -1052,11 +1072,15 @@ export class SASViyaApiClient {
       Promise.reject(`Job state link was not found.`)
     }
 
-    const { result: state } = await this.requestClient.get<string>(
-      `${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
-      accessToken,
-      'text/plain'
-    )
+    const { result: state } = await this.requestClient
+      .get<string>(
+        `${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
+        accessToken,
+        'text/plain'
+      )
+      .catch((err) => {
+        throw prefixMessage(err, 'Error while getting job state. ')
+      })
 
     const currentState = state.trim()
     if (currentState === 'completed') {
@@ -1073,11 +1097,15 @@ export class SASViyaApiClient {
           postedJobState === 'pending'
         ) {
           if (stateLink) {
-            const { result: jobState } = await this.requestClient.get<string>(
-              `${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
-              accessToken,
-              'text/plain'
-            )
+            const { result: jobState } = await this.requestClient
+              .get<string>(
+                `${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
+                accessToken,
+                'text/plain'
+              )
+              .catch((err) => {
+                throw prefixMessage(err, 'Error while getting job state. ')
+              })
 
             postedJobState = jobState.trim()
 
@@ -1119,11 +1147,11 @@ export class SASViyaApiClient {
         )
       }
 
-      const uploadResponse = await this.requestClient.uploadFile(
-        `${this.serverUrl}/files/files#rawUpload`,
-        csv,
-        accessToken
-      )
+      const uploadResponse = await this.requestClient
+        .uploadFile(`${this.serverUrl}/files/files#rawUpload`, csv, accessToken)
+        .catch((err) => {
+          throw prefixMessage(err, 'Error while uploading file. ')
+        })
 
       uploadedFiles.push({ tableName, file: uploadResponse.result })
     }

src/SessionManager.ts

@@ -64,7 +64,7 @@ export class SessionManager {
         this.sessions = this.sessions.filter((s) => s.id !== id)
       })
       .catch((err) => {
-        throw err
+        throw prefixMessage(err, 'Error while deleting session. ')
       })
   }
 

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(