chore(*): clean up, handle debug responses

src/job-execution/ComputeJobExecutor.ts

@@ -2,7 +2,6 @@ import { ServerType } from '@sasjs/utils/types'
 import { ErrorResponse } from '..'
 import { SASViyaApiClient } from '../SASViyaApiClient'
 import { ComputeJobExecutionError, LoginRequiredError } from '../types'
-import { parseWeboutResponse } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
 
 export class ComputeJobExecutor extends BaseJobExecutor {
@@ -35,15 +34,7 @@ export class ComputeJobExecutor extends BaseJobExecutor {
         this.appendRequest(response, sasJob, config.debug)
         let responseJson
 
-        try {
-          if (typeof response!.result === 'string') {
-            responseJson = JSON.parse(response!.result)
-          } else {
-            responseJson = response!.result
-          }
-        } catch {
-          responseJson = JSON.parse(parseWeboutResponse(response!.result))
-        }
+        return response.result
 
         return responseJson
       })

src/job-execution/JesJobExecutor.ts

@@ -2,7 +2,6 @@ import { ServerType } from '@sasjs/utils/types'
 import { ErrorResponse } from '..'
 import { SASViyaApiClient } from '../SASViyaApiClient'
 import { JobExecutionError, LoginRequiredError } from '../types'
-import { parseWeboutResponse } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
 
 export class JesJobExecutor extends BaseJobExecutor {
@@ -23,19 +22,7 @@ export class JesJobExecutor extends BaseJobExecutor {
       .then((response) => {
         this.appendRequest(response, sasJob, config.debug)
 
-        let responseJson
-
-        try {
-          if (typeof response!.result === 'string') {
-            responseJson = JSON.parse(response!.result)
-          } else {
-            responseJson = response!.result
-          }
-        } catch {
-          responseJson = JSON.parse(parseWeboutResponse(response!.result))
-        }
-
-        return responseJson
+        return response.result
       })
       .catch(async (e: Error) => {
         if (e instanceof JobExecutionError) {

src/job-execution/JobExecutor.ts

@@ -90,8 +90,13 @@ export abstract class BaseJobExecutor implements JobExecutor {
       }
     }
 
+    const stringifiedResult =
+      typeof response?.result === 'string'
+        ? response?.result
+        : JSON.stringify(response?.result, null, 2)
+
     this.requests.push({
-      logFile: response?.log || response?.result || response,
+      logFile: response?.log || stringifiedResult || response,
       serviceLink: program,
       timestamp: new Date(),
       sourceCode,

src/job-execution/WebJobExecutor.ts

@@ -82,6 +82,13 @@ 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
+          )
+          this.appendRequest(res, sasJob, config.debug)
+          return jsonResponse
+        }
         this.appendRequest(res, sasJob, config.debug)
         return res.result
       })
@@ -99,6 +106,20 @@ export class WebJobExecutor extends BaseJobExecutor {
       })
   }
 
+  private parseSasViyaDebugResponse = async (response: string) => {
+    const iframeStart = response.split(
+      '<iframe style="width: 99%; height: 500px" src="'
+    )[1]
+    const jsonUrl = iframeStart ? iframeStart.split('"></iframe>')[0] : null
+    if (!jsonUrl) {
+      throw new Error('Unable to find webout file URL.')
+    }
+
+    return this.requestClient
+      .get(this.serverUrl + jsonUrl, undefined)
+      .then((res) => res.result)
+  }
+
   private async getJobUri(sasJob: string) {
     if (!this.sasViyaApiClient) return ''
     let uri = ''