@sasjs/adapter 3.6.0 → 3.7.2

package/node/request/RequestClient.d.ts

@@ -35,10 +35,11 @@ export interface HttpClient {
 export declare class RequestClient implements HttpClient {
     protected baseUrl: string;
     private requests;
+    private requestsLimit;
     protected csrfToken: CsrfToken;
     protected fileUploadCsrfToken: CsrfToken | undefined;
     protected httpClient: AxiosInstance;
-    constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions);
+    constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions, requestsLimit?: number);
     setConfig(baseUrl: string, httpsAgentOptions?: https.AgentOptions): void;
     saveLocalStorageToken(accessToken: string, refreshToken: string): void;
     getCsrfToken(type?: 'general' | 'file'): CsrfToken | undefined;

package/node/types/SASjsConfig.d.ts

@@ -60,7 +60,7 @@ export declare class SASjsConfig {
      */
     useComputeApi: boolean | null;
     /**
-     * Optional settings to configure HTTPS Agent.
+     * Optional setting to configure HTTPS Agent.
      * By providing `key`, `cert`, `ca` to connect with server
      * Other options can be set `rejectUnauthorized` and `requestCert`
      */
@@ -69,6 +69,11 @@ export declare class SASjsConfig {
      * Supported login mechanisms are - Redirected and Default
      */
     loginMechanism: LoginMechanism;
+    /**
+     * Optional setting to configure request history limit. Increasing this limit
+     * may affect browser performance, especially with debug (logs) enabled.
+     */
+    requestHistoryLimit?: number;
 }
 export declare enum LoginMechanism {
     Default = "Default",

package/node/utils/convertToCsv.d.ts

@@ -2,7 +2,7 @@
  * Converts the given JSON object array to a CSV string.
  * @param data - the array of JSON objects to convert.
  */
-export declare const convertToCSV: (data: any, sasFormats?: {
+export declare const convertToCSV: (data: any[], sasFormats?: {
     formats: {
         [key: string]: string;
     };

package/package.json

@@ -80,5 +80,5 @@
     "https": "1.0.0",
     "tough-cookie": "4.0.0"
   },
-  "version": "3.6.0"
+  "version": "3.7.2"
 }

package/request/RequestClient.d.ts

@@ -35,10 +35,11 @@ export interface HttpClient {
 export declare class RequestClient implements HttpClient {
     protected baseUrl: string;
     private requests;
+    private requestsLimit;
     protected csrfToken: CsrfToken;
     protected fileUploadCsrfToken: CsrfToken | undefined;
     protected httpClient: AxiosInstance;
-    constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions);
+    constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions, requestsLimit?: number);
     setConfig(baseUrl: string, httpsAgentOptions?: https.AgentOptions): void;
     saveLocalStorageToken(accessToken: string, refreshToken: string): void;
     getCsrfToken(type?: 'general' | 'file'): CsrfToken | undefined;

package/src/SASjs.ts

@@ -1034,7 +1034,8 @@ export default class SASjs {
           : RequestClient
       this.requestClient = new RequestClientClass(
         this.sasjsConfig.serverUrl,
-        this.sasjsConfig.httpsAgentOptions
+        this.sasjsConfig.httpsAgentOptions,
+        this.sasjsConfig.requestHistoryLimit
       )
     } else {
       this.requestClient.setConfig(

package/src/file/generateFileUploadForm.ts

@@ -5,8 +5,11 @@ export const generateFileUploadForm = (
   data: any
 ): FormData => {
   for (const tableName in data) {
+    if (!Array.isArray(data[tableName])) continue
+
     const name = tableName
     const csv = convertToCSV(data[tableName])
+
     if (csv === 'ERROR: LARGE STRING LENGTH') {
       throw new Error(
         'The max length of a string value in SASjs is 32765 characters.'

package/src/job-execution/SasJsJobExecutor.ts

@@ -52,17 +52,25 @@ export class SasJsJobExecutor extends BaseJobExecutor {
         authConfig?.access_token
       )
         .then(async (res: any) => {
+          const parsedSasjsServerLog = res.result.log
+            .map((logLine: any) => logLine.line)
+            .join('\n')
+
           const resObj = {
             result: res.result._webout,
-            log: res.result.log
+            log: parsedSasjsServerLog
           }
           this.requestClient!.appendRequest(resObj, sasJob, config.debug)
 
           let jsonResponse = res.result
 
           if (config.debug) {
-            const webout = parseWeboutResponse(res.result._webout, apiUrl)
-            jsonResponse = getValidJson(webout)
+            if (typeof res.result._webout === 'object') {
+              jsonResponse = res.result._webout
+            } else {
+              const webout = parseWeboutResponse(res.result._webout, apiUrl)
+              jsonResponse = getValidJson(webout)
+            }
           } else {
             jsonResponse = getValidJson(res.result._webout)
           }

package/src/job-execution/WebJobExecutor.ts

@@ -146,11 +146,16 @@ export class WebJobExecutor extends BaseJobExecutor {
     const requestPromise = new Promise((resolve, reject) => {
       this.requestClient!.post(apiUrl, formData, authConfig?.access_token)
         .then(async (res: any) => {
+          const parsedSasjsServerLog =
+            this.serverType === ServerType.Sasjs
+              ? res.result.log.map((logLine: any) => logLine.line).join('\n')
+              : res.result.log
+
           const resObj =
             this.serverType === ServerType.Sasjs
               ? {
                   result: res.result._webout,
-                  log: res.result.log
+                  log: parsedSasjsServerLog
                 }
               : res
           this.requestClient!.appendRequest(resObj, sasJob, config.debug)
@@ -173,8 +178,12 @@ export class WebJobExecutor extends BaseJobExecutor {
                     : res.result
                 break
               case ServerType.Sasjs:
-                const webout = parseWeboutResponse(res.result._webout, apiUrl)
-                jsonResponse = getValidJson(webout)
+                if (typeof res.result._webout === 'object') {
+                  jsonResponse = res.result._webout
+                } else {
+                  const webout = parseWeboutResponse(res.result._webout, apiUrl)
+                  jsonResponse = getValidJson(webout)
+                }
                 break
             }
           } else if (this.serverType === ServerType.Sasjs) {

package/src/request/RequestClient.ts

@@ -56,6 +56,7 @@ export interface HttpClient {
 
 export class RequestClient implements HttpClient {
   private requests: SASjsRequest[] = []
+  private requestsLimit: number = 10
 
   protected csrfToken: CsrfToken = { headerName: '', value: '' }
   protected fileUploadCsrfToken: CsrfToken | undefined
@@ -63,9 +64,11 @@ export class RequestClient implements HttpClient {
 
   constructor(
     protected baseUrl: string,
-    httpsAgentOptions?: https.AgentOptions
+    httpsAgentOptions?: https.AgentOptions,
+    requestsLimit?: number
   ) {
     this.createHttpClient(baseUrl, httpsAgentOptions)
+    if (requestsLimit) this.requestsLimit = requestsLimit
   }
 
   public setConfig(baseUrl: string, httpsAgentOptions?: https.AgentOptions) {
@@ -149,7 +152,7 @@ export class RequestClient implements HttpClient {
       SASWORK: sasWork
     })
 
-    if (this.requests.length > 20) {
+    if (this.requests.length > this.requestsLimit) {
       this.requests.splice(0, 1)
     }
   }

package/src/types/SASjsConfig.ts

@@ -60,7 +60,7 @@ export class SASjsConfig {
    */
   useComputeApi: boolean | null = null
   /**
-   * Optional settings to configure HTTPS Agent.
+   * Optional setting to configure HTTPS Agent.
    * By providing `key`, `cert`, `ca` to connect with server
    * Other options can be set `rejectUnauthorized` and `requestCert`
    */
@@ -69,6 +69,11 @@ export class SASjsConfig {
    * Supported login mechanisms are - Redirected and Default
    */
   loginMechanism: LoginMechanism = LoginMechanism.Default
+  /**
+   * Optional setting to configure request history limit. Increasing this limit
+   * may affect browser performance, especially with debug (logs) enabled.
+   */
+  requestHistoryLimit?: number = 10
 }
 
 export enum LoginMechanism {

package/src/utils/convertToCsv.ts

@@ -3,7 +3,7 @@
  * @param data - the array of JSON objects to convert.
  */
 export const convertToCSV = (
-  data: any,
+  data: any[],
   sasFormats?: { formats: { [key: string]: string } }
 ) => {
   let formats = sasFormats?.formats
@@ -76,7 +76,7 @@ export const convertToCSV = (
               return byteSize
             }
           })
-          .sort((a: number, b: number) => b - a)[0]
+          .sort((a: any, b: any) => b - a)[0]
 
         if (longestValueForField && longestValueForField > 32765) {
           invalidString = true

package/types/SASjsConfig.d.ts

@@ -60,7 +60,7 @@ export declare class SASjsConfig {
      */
     useComputeApi: boolean | null;
     /**
-     * Optional settings to configure HTTPS Agent.
+     * Optional setting to configure HTTPS Agent.
      * By providing `key`, `cert`, `ca` to connect with server
      * Other options can be set `rejectUnauthorized` and `requestCert`
      */
@@ -69,6 +69,11 @@ export declare class SASjsConfig {
      * Supported login mechanisms are - Redirected and Default
      */
     loginMechanism: LoginMechanism;
+    /**
+     * Optional setting to configure request history limit. Increasing this limit
+     * may affect browser performance, especially with debug (logs) enabled.
+     */
+    requestHistoryLimit?: number;
 }
 export declare enum LoginMechanism {
     Default = "Default",

package/utils/convertToCsv.d.ts

@@ -2,7 +2,7 @@
  * Converts the given JSON object array to a CSV string.
  * @param data - the array of JSON objects to convert.
  */
-export declare const convertToCSV: (data: any, sasFormats?: {
+export declare const convertToCSV: (data: any[], sasFormats?: {
     formats: {
         [key: string]: string;
     };