fix(session): add internal SAS error handler

src/SASViyaApiClient.ts

@@ -145,7 +145,8 @@ export class SASViyaApiClient {
     const promises = contextsList.map((context: any) => {
       const linesOfCode = ['%put &=sysuserid;']
 
-      return this.executeScript(
+      return () =>
+        this.executeScript(
           `test-${context.name}`,
           linesOfCode,
           context.name,
@@ -155,7 +156,9 @@ export class SASViyaApiClient {
         ).catch((err) => err)
     })
 
-    const results = await Promise.all(promises)
+    let results: any[] = []
+
+    for (const promise of promises) results.push(await promise())
 
     results.forEach((result: any, index: number) => {
       if (result && result.body && result.body.details) {
@@ -333,7 +336,9 @@ export class SASViyaApiClient {
     originalContext = await this.getComputeContextByName(
       contextName,
       accessToken
-    ).catch((_) => {})
+    ).catch((err) => {
+      throw err
+    })
 
     // Try to find context by id, when context name has been changed.
     if (!originalContext) {
@@ -441,7 +446,12 @@ export class SASViyaApiClient {
       }
 
       let executionSessionId: string
-      const session = await this.sessionManager.getSession(accessToken)
+      const session = await this.sessionManager
+        .getSession(accessToken)
+        .catch((err) => {
+          throw err
+        })
+
       executionSessionId = session!.id
 
       const jobArguments: { [key: string]: any } = {
@@ -480,7 +490,9 @@ export class SASViyaApiClient {
 
       if (data) {
         if (JSON.stringify(data).includes(';')) {
-          files = await this.uploadTables(data, accessToken)
+          files = await this.uploadTables(data, accessToken).catch((err) => {
+            throw err
+          })
 
           jobVariables['_webin_file_count'] = files.length
 
@@ -511,7 +523,9 @@ export class SASViyaApiClient {
       const { result: postedJob, etag } = await this.request<Job>(
         `${this.serverUrl}/compute/sessions/${executionSessionId}/jobs`,
         postJobRequest
-      )
+      ).catch((err) => {
+        throw err
+      })
 
       if (this.debug) {
         console.log(`Job has been submitted for '${fileName}'.`)
@@ -527,7 +541,9 @@ export class SASViyaApiClient {
       const { result: currentJob } = await this.request<Job>(
         `${this.serverUrl}/compute/sessions/${executionSessionId}/jobs/${postedJob.id}`,
         { headers }
-      )
+      ).catch((err) => {
+        throw err
+      })
 
       let jobResult
       let log
@@ -540,9 +556,13 @@ export class SASViyaApiClient {
           {
             headers
           }
-        ).then((res: any) =>
+        )
+          .then((res: any) =>
             res.result.items.map((i: any) => i.line).join('\n')
           )
+          .catch((err) => {
+            throw err
+          })
       }
 
       if (jobStatus === 'failed' || jobStatus === 'error') {
@@ -568,9 +588,13 @@ export class SASViyaApiClient {
                 {
                   headers
                 }
-              ).then((res: any) =>
+              )
+                .then((res: any) =>
                   res.result.items.map((i: any) => i.line).join('\n')
                 )
+                .catch((err) => {
+                  throw err
+                })
 
               return Promise.reject(
                 new ErrorResponse('Job execution failed', {
@@ -586,7 +610,11 @@ export class SASViyaApiClient {
         })
       }
 
-      await this.sessionManager.clearSession(executionSessionId, accessToken)
+      await this.sessionManager
+        .clearSession(executionSessionId, accessToken)
+        .catch((err) => {
+          throw err
+        })
 
       return { result: jobResult?.result, log }
     } catch (e) {

src/SessionManager.ts

@@ -2,6 +2,12 @@ import { Session, Context, CsrfToken } from './types'
 import { asyncForEach, makeRequest, isUrl } from './utils'
 
 const MAX_SESSION_COUNT = 1
+const RETRY_LIMIT: number = 3
+let RETRY_COUNT: number = 0
+const INTERNAL_SAS_ERROR = {
+  status: 304,
+  message: 'Not Modified'
+}
 
 export class SessionManager {
   constructor(
@@ -27,19 +33,22 @@ export class SessionManager {
 
   async getSession(accessToken?: string) {
     await this.createSessions(accessToken)
-    this.createAndWaitForSession(accessToken)
+    await this.createAndWaitForSession(accessToken)
     const session = this.sessions.pop()
     const secondsSinceSessionCreation =
       (new Date().getTime() - new Date(session!.creationTimeStamp).getTime()) /
       1000
+
     if (
       !session!.attributes ||
       secondsSinceSessionCreation >= session!.attributes.sessionInactiveTimeout
     ) {
       await this.createSessions(accessToken)
       const freshSession = this.sessions.pop()
+
       return freshSession
     }
+
     return session
   }
 
@@ -48,22 +57,37 @@ export class SessionManager {
       method: 'DELETE',
       headers: this.getHeaders(accessToken)
     }
+
     return await this.request<Session>(
       `${this.serverUrl}/compute/sessions/${id}`,
       deleteSessionRequest
-    ).then(() => {
+    )
+      .then(() => {
         this.sessions = this.sessions.filter((s) => s.id !== id)
       })
+      .catch((err) => {
+        throw err
+      })
   }
 
   private async createSessions(accessToken?: string) {
     if (!this.sessions.length) {
       if (!this.currentContext) {
-        await this.setCurrentContext(accessToken)
+        await this.setCurrentContext(accessToken).catch((err) => {
+          throw err
+        })
       }
+
       await asyncForEach(new Array(MAX_SESSION_COUNT), async () => {
-        const createdSession = await this.createAndWaitForSession(accessToken)
+        const createdSession = await this.createAndWaitForSession(
+          accessToken
+        ).catch((err) => {
+          throw err
+        })
+
         this.sessions.push(createdSession)
+      }).catch((err) => {
+        throw err
       })
     }
   }
@@ -73,13 +97,18 @@ export class SessionManager {
       method: 'POST',
       headers: this.getHeaders(accessToken)
     }
+
     const { result: createdSession, etag } = await this.request<Session>(
       `${this.serverUrl}/compute/contexts/${this.currentContext!.id}/sessions`,
       createSessionRequest
-    )
+    ).catch((err) => {
+      throw err
+    })
 
     await this.waitForSession(createdSession, etag, accessToken)
+
     this.sessions.push(createdSession)
+
     return createdSession
   }
 
@@ -89,6 +118,8 @@ export class SessionManager {
         items: Context[]
       }>(`${this.serverUrl}/compute/contexts?limit=10000`, {
         headers: this.getHeaders(accessToken)
+      }).catch((err) => {
+        throw err
       })
 
       const contextsList =
@@ -107,6 +138,8 @@ export class SessionManager {
       }
 
       this.currentContext = currentContext
+
+      Promise.resolve()
     }
   }
 
@@ -114,6 +147,7 @@ export class SessionManager {
     const headers: any = {
       'Content-Type': 'application/json'
     }
+
     if (accessToken) {
       headers.Authorization = `Bearer ${accessToken}`
     }
@@ -132,24 +166,41 @@ export class SessionManager {
       'If-None-Match': etag
     }
     const stateLink = session.links.find((l: any) => l.rel === 'state')
+
     return new Promise(async (resolve, _) => {
       if (sessionState === 'pending') {
         if (stateLink) {
           if (this.debug) {
             console.log('Polling session status... \n') // ?
           }
-          const { result: state } = await this.request<string>(
+
+          const { result: state } = await this.requestSessionStatus<string>(
             `${this.serverUrl}${stateLink.href}?wait=30`,
             {
               headers
             },
             'text'
-          )
+          ).catch((err) => {
+            throw err
+          })
 
           sessionState = state.trim()
+
           if (this.debug) {
             console.log(`Current state is '${sessionState}'\n`)
           }
+
+          // There is an internal error present in SAS Viya 3.5
+          // Retry to wait for a session status in such case of SAS internal error
+          if (
+            sessionState === INTERNAL_SAS_ERROR.message &&
+            RETRY_COUNT < RETRY_LIMIT
+          ) {
+            RETRY_COUNT++
+
+            resolve(this.waitForSession(session, etag, accessToken))
+          }
+
           resolve(sessionState)
         }
       } else {
@@ -169,6 +220,7 @@ export class SessionManager {
         [this.csrfToken.headerName]: this.csrfToken.value
       }
     }
+
     return await makeRequest<T>(
       url,
       options,
@@ -177,6 +229,36 @@ export class SessionManager {
         this.setCsrfToken(token)
       },
       contentType
-    )
+    ).catch((err) => {
+      throw err
+    })
+  }
+
+  private async requestSessionStatus<T>(
+    url: string,
+    options: RequestInit,
+    contentType: 'text' | 'json' = 'json'
+  ) {
+    if (this.csrfToken) {
+      options.headers = {
+        ...options.headers,
+        [this.csrfToken.headerName]: this.csrfToken.value
+      }
+    }
+
+    return await makeRequest<T>(
+      url,
+      options,
+      (token) => {
+        this.csrfToken = token
+        this.setCsrfToken(token)
+      },
+      contentType
+    ).catch((err) => {
+      if (err.status === INTERNAL_SAS_ERROR.status)
+        return { result: INTERNAL_SAS_ERROR.message }
+
+      throw err
+    })
   }
 }

src/utils/makeRequest.ts

@@ -2,7 +2,7 @@ import { CsrfToken } from '../types'
 import { needsRetry } from './needsRetry'
 
 let retryCount: number = 0
-let retryLimit: number = 5
+const retryLimit: number = 5
 
 export async function makeRequest<T>(
   url: string,
@@ -18,10 +18,12 @@ export async function makeRequest<T>(
       : (res: Response) => res.text()
   let etag = null
 
-  const result = await fetch(url, request).then(async (response) => {
+  const result = await fetch(url, request)
+    .then(async (response) => {
       if (response.redirected && response.url.includes('SASLogon/login')) {
         return Promise.reject({ status: 401 })
       }
+
       if (!response.ok) {
         if (response.status === 403) {
           const tokenHeader = response.headers.get('X-CSRF-HEADER')
@@ -38,12 +40,14 @@ export async function makeRequest<T>(
               headers: { ...request.headers, [tokenHeader]: token }
             }
 
-          return fetch(url, retryRequest).then((res) => {
+            return await fetch(url, retryRequest).then((res) => {
               etag = res.headers.get('ETag')
               return responseTransform(res)
             })
           } else {
-          let body: any = await response.text()
+            let body: any = await response.text().catch((err) => {
+              throw err
+            })
 
             try {
               body = JSON.parse(body)
@@ -58,7 +62,9 @@ export async function makeRequest<T>(
             return Promise.reject({ status: response.status, body })
           }
         } else {
-        let body: any = await response.text()
+          let body: any = await response.text().catch((err) => {
+            throw err
+          })
 
           if (needsRetry(body)) {
             if (retryCount < retryLimit) {
@@ -68,7 +74,9 @@ export async function makeRequest<T>(
                 retryRequest || request,
                 callback,
                 contentType
-            )
+              ).catch((err) => {
+                throw err
+              })
               retryCount = 0
 
               etag = retryResponse.etag
@@ -98,7 +106,11 @@ export async function makeRequest<T>(
         if (response.status === 204) {
           return Promise.resolve()
         }
-      const responseTransformed = await responseTransform(response)
+        const responseTransformed = await responseTransform(response).catch(
+          (err) => {
+            throw err
+          }
+        )
         let responseText = ''
 
         if (typeof responseTransformed === 'string') {
@@ -115,7 +127,9 @@ export async function makeRequest<T>(
               retryRequest || request,
               callback,
               contentType
-          )
+            ).catch((err) => {
+              throw err
+            })
             retryCount = 0
 
             etag = retryResponse.etag
@@ -128,9 +142,13 @@ export async function makeRequest<T>(
         }
 
         etag = response.headers.get('ETag')
+
         return responseTransformed
       }
     })
+    .catch((err) => {
+      throw err
+    })
 
   return { result, etag }
 }