Merge pull request #658 from sasjs/return-log-for-web-job-executor

fix: WebJobExecutor also returns log along result

src/SASjsApiClient.ts

@@ -37,7 +37,10 @@ export class SASjsApiClient {
     }>(
       'SASjsApi/drive/deploy',
       { fileTree: members, appLoc: appLoc },
-      access_token
+      access_token,
+      undefined,
+      {},
+      { maxContentLength: Infinity, maxBodyLength: Infinity }
     )
 
     return Promise.resolve(result)

src/job-execution/WebJobExecutor.ts

@@ -151,7 +151,7 @@ export class WebJobExecutor extends BaseJobExecutor {
 
     /* The NodeFormData object does not set the request header - so, set it */
     const contentType =
-      formData instanceof NodeFormData
+      formData instanceof NodeFormData && typeof FormData === 'undefined'
         ? `multipart/form-data; boundary=${formData.getBoundary()}`
         : undefined
 
@@ -208,7 +208,7 @@ export class WebJobExecutor extends BaseJobExecutor {
           }
 
           const responseObject = appendExtraResponseAttributes(
-            { result: jsonResponse },
+            { result: jsonResponse, log: parsedSasjsServerLog },
             extraResponseAttributes
           )
           resolve(responseObject)

src/request/RequestClient.ts

@@ -207,7 +207,8 @@ export class RequestClient implements HttpClient {
     data: any,
     accessToken: string | undefined,
     contentType = 'application/json',
-    overrideHeaders: { [key: string]: string | number } = {}
+    overrideHeaders: { [key: string]: string | number } = {},
+    additionalSettings: { [key: string]: string | number } = {}
   ): Promise<{ result: T; etag: string }> {
     const headers = {
       ...this.getHeaders(accessToken, contentType),
@@ -215,7 +216,11 @@ export class RequestClient implements HttpClient {
     }
 
     return this.httpClient
-      .post<T>(url, data, { headers, withCredentials: true })
+      .post<T>(url, data, {
+        headers,
+        withCredentials: true,
+        ...additionalSettings
+      })
       .then((response) => {
         throwIfError(response)
 
@@ -630,7 +635,7 @@ const parseError = (data: string) => {
       if (parts.length > 1) {
         const storedProcessPath = parts[1].split('<i>')[1].split('</i>')[0]
         const message = `Stored process not found: ${storedProcessPath}`
-        return new JobExecutionError(404, message, '')
+        return new JobExecutionError(500, message, '')
       }
     }
   } catch (_) {}
@@ -644,7 +649,7 @@ const parseError = (data: string) => {
       if (parts.length > 1) {
         const log = parts[1].split('<pre>')[1].split('</pre>')[0]
         const message = `This request completed with errors.`
-        return new JobExecutionError(404, message, log)
+        return new JobExecutionError(500, message, log)
       }
     }
   } catch (_) {}

src/utils/getValidJson.ts

@@ -12,6 +12,8 @@ export const getValidJson = (str: string | object): object => {
 
     if (typeof str === 'object') return str
 
+    if (str === '') return {}
+
     return JSON.parse(str)
   } catch (e) {
     if (e instanceof JsonParseArrayError) throw e