@sasjs/adapter 3.0.1 → 3.0.2

package/node/job-execution/Sas9JobExecutor.d.ts

@@ -2,6 +2,7 @@
 import * as https from 'https';
 import { ServerType } from '@sasjs/utils/types';
 import { BaseJobExecutor } from './JobExecutor';
+import { RequestClient } from '../request/RequestClient';
 /**
  * Job executor for SAS9 servers for use in Node.js environments.
  * Initiates login with the provided username and password from the config
@@ -11,10 +12,8 @@ import { BaseJobExecutor } from './JobExecutor';
 export declare class Sas9JobExecutor extends BaseJobExecutor {
     private jobsPath;
     private requestClient;
-    constructor(serverUrl: string, serverType: ServerType, jobsPath: string, httpsAgentOptions?: https.AgentOptions);
-    execute(sasJob: string, data: any, config: any): Promise<{
-        result: unknown;
-        etag: string;
-    }>;
+    private sas9RequestClient;
+    constructor(serverUrl: string, serverType: ServerType, jobsPath: string, requestClient: RequestClient, httpsAgentOptions?: https.AgentOptions);
+    execute(sasJob: string, data: any, config: any): Promise<any>;
     private getRequestParams;
 }

package/package.json

@@ -64,7 +64,7 @@
     "ts-loader": "^9.2.6",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typedoc": "^0.22.4",
+    "typedoc": "0.19.2",
     "typedoc-neo-theme": "^1.1.1",
     "typedoc-plugin-external-module-name": "^4.0.6",
     "typescript": "4.3.5",
@@ -80,5 +80,5 @@
     "https": "^1.0.0",
     "tough-cookie": "^4.0.0"
   },
-  "version": "3.0.1"
+  "version": "3.0.2"
 }

package/src/SASjs.ts

@@ -1044,6 +1044,7 @@ export default class SASjs {
       this.sasjsConfig.serverUrl,
       this.sasjsConfig.serverType!,
       this.jobsPath,
+      this.requestClient,
       this.sasjsConfig.httpsAgentOptions
     )
 

package/src/job-execution/Sas9JobExecutor.ts

@@ -5,6 +5,7 @@ import { ErrorResponse } from '../types/errors'
 import { convertToCSV, isRelativePath } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
 import { Sas9RequestClient } from '../request/Sas9RequestClient'
+import { RequestClient } from '../request/RequestClient'
 
 /**
  * Job executor for SAS9 servers for use in Node.js environments.
@@ -13,15 +14,16 @@ import { Sas9RequestClient } from '../request/Sas9RequestClient'
  * job execution requests.
  */
 export class Sas9JobExecutor extends BaseJobExecutor {
-  private requestClient: Sas9RequestClient
+  private sas9RequestClient: Sas9RequestClient
   constructor(
     serverUrl: string,
     serverType: ServerType,
     private jobsPath: string,
+    private requestClient: RequestClient,
     httpsAgentOptions?: https.AgentOptions
   ) {
     super(serverUrl, serverType)
-    this.requestClient = new Sas9RequestClient(serverUrl, httpsAgentOptions)
+    this.sas9RequestClient = new Sas9RequestClient(serverUrl, httpsAgentOptions)
   }
 
   async execute(sasJob: string, data: any, config: any) {
@@ -37,6 +39,8 @@ export class Sas9JobExecutor extends BaseJobExecutor {
         : ''
     }`
 
+    apiUrl = `${apiUrl}${config.debug ? '&_debug=131' : ''}`
+
     let requestParams = {
       ...this.getRequestParams(config)
     }
@@ -49,6 +53,8 @@ export class Sas9JobExecutor extends BaseJobExecutor {
       } catch (e: any) {
         return Promise.reject(new ErrorResponse(e?.message, e))
       }
+    } else {
+      data = ''
     }
 
     for (const key in requestParams) {
@@ -57,16 +63,18 @@ export class Sas9JobExecutor extends BaseJobExecutor {
       }
     }
 
-    await this.requestClient.login(
+    await this.sas9RequestClient.login(
       config.username,
       config.password,
       this.jobsPath
     )
+
     const contentType =
       data && Object.keys(data).length
         ? 'multipart/form-data; boundary=' + (formData as any)._boundary
         : 'text/plain'
-    return await this.requestClient!.post(
+
+    return await this.sas9RequestClient!.post(
       apiUrl,
       formData,
       undefined,
@@ -76,6 +84,28 @@ export class Sas9JobExecutor extends BaseJobExecutor {
         Connection: 'Keep-Alive'
       }
     )
+      .then((res: any) => {
+        let resString = res
+
+        if (typeof res === 'object') {
+          resString = JSON.stringify(res)
+        }
+
+        this.requestClient!.appendRequest(resString, sasJob, config.debug)
+
+        return res
+      })
+      .catch((err: any) => {
+        let errString = err
+
+        if (typeof err === 'object') {
+          errString = JSON.stringify(errString)
+        }
+
+        this.requestClient!.appendRequest(errString, sasJob, config.debug)
+
+        return err
+      })
   }
 
   private getRequestParams(config: any): any {

package/CHANGELOG.md

@@ -1,213 +0,0 @@
-# Change Log
-
-Since March 2020 the changelog is managed by github releases - see [https://github.com/sasjs/adapter/releases](https://github.com/sasjs/adapter/releases).
-
-## Changes up to 5th March 2020
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-<a name="1.9.0"></a>
-# [1.9.0](https://github.com/macropeople/sasjs/compare/v1.8.0...v1.9.0) (2020-03-05)
-
-
-### Bug Fixes
-
-* special chars regex, csv function improvements ([5c8e3fe](https://github.com/macropeople/sasjs/commit/5c8e3fe))
-* splitting tests in different files ([95e1d8b](https://github.com/macropeople/sasjs/commit/95e1d8b))
-* switching crlfs to lfs in values ([277cf3f](https://github.com/macropeople/sasjs/commit/277cf3f))
-
-
-### Features
-
-* fixing tests to fit adapter behaviour ([6146189](https://github.com/macropeople/sasjs/commit/6146189))
-
-
-
-<a name="1.8.0"></a>
-# [1.8.0](https://github.com/macropeople/sasjs/compare/v1.7.2...v1.8.0) (2020-03-03)
-
-
-### Bug Fixes
-
-* parsing error from response ([ff5fa1b](https://github.com/macropeople/sasjs/commit/ff5fa1b))
-
-
-### Features
-
-* update SASjs configuration after initializaton ([ee1255c](https://github.com/macropeople/sasjs/commit/ee1255c))
-
-
-
-<a name="1.7.2"></a>
-## [1.7.2](https://github.com/macropeople/sasjs/compare/v1.7.1...v1.7.2) (2020-03-02)
-
-
-
-<a name="1.7.1"></a>
-## [1.7.1](https://github.com/macropeople/sasjs/compare/v1.7.0...v1.7.1) (2020-03-02)
-
-
-### Bug Fixes
-
-* header data types, empty numerics ([c95c9fc](https://github.com/macropeople/sasjs/commit/c95c9fc))
-
-
-
-<a name="1.7.0"></a>
-# [1.7.0](https://github.com/macropeople/sasjs/compare/v1.6.5...v1.7.0) (2020-03-01)
-
-
-### Bug Fixes
-
-* adapter upgrade ([7c221dc](https://github.com/macropeople/sasjs/commit/7c221dc))
-* failing test ([12b29b0](https://github.com/macropeople/sasjs/commit/12b29b0))
-* retry on redirect only with SAS9 ([69d08e5](https://github.com/macropeople/sasjs/commit/69d08e5))
-* test rewrite ([aeb636b](https://github.com/macropeople/sasjs/commit/aeb636b))
-
-
-### Features
-
-*  tests for sasjs, also bumping cypress version and setting cypress tsconfig to ES6 (we'll be using cypress browsers) ([e8193c1](https://github.com/macropeople/sasjs/commit/e8193c1))
-*  tests for sasjs, also bumping cypress version and setting cypress tsconfig to ES6 (we'll be using cypress browsers) ([a197344](https://github.com/macropeople/sasjs/commit/a197344))
-
-
-
-<a name="1.6.5"></a>
-## [1.6.5](https://github.com/macropeople/sasjs/compare/v1.6.4...v1.6.5) (2020-03-01)
-
-
-
-<a name="1.6.4"></a>
-## [1.6.4](https://github.com/macropeople/sasjs/compare/v1.6.3...v1.6.4) (2020-03-01)
-
-
-
-<a name="1.6.3"></a>
-## [1.6.3](https://github.com/macropeople/sasjs/compare/v1.6.2...v1.6.3) (2020-02-26)
-
-
-### Bug Fixes
-
-* always check session before trying to log in ([6f256ac](https://github.com/macropeople/sasjs/commit/6f256ac))
-
-
-
-<a name="1.6.2"></a>
-## [1.6.2](https://github.com/macropeople/sasjs/compare/v1.6.1...v1.6.2) (2020-02-26)
-
-
-### Bug Fixes
-
-* SAS9 response fix ([4917d38](https://github.com/macropeople/sasjs/commit/4917d38))
-
-
-
-<a name="1.6.1"></a>
-## [1.6.1](https://github.com/macropeople/sasjs/compare/v1.6.0...v1.6.1) (2020-02-23)
-
-
-
-<a name="1.6.0"></a>
-# [1.6.0](https://github.com/macropeople/sasjs/compare/v1.5.4...v1.6.0) (2020-02-23)
-
-
-### Features
-
-* adding sasjs JS file in dist folder ([a4d7e87](https://github.com/macropeople/sasjs/commit/a4d7e87))
-
-
-
-<a name="1.5.4"></a>
-## [1.5.4](https://github.com/macropeople/sasjs/compare/v1.5.3...v1.5.4) (2020-02-22)
-
-
-### Bug Fixes
-
-* splice log only if there is a log in Viya ([d72a987](https://github.com/macropeople/sasjs/commit/d72a987))
-
-
-
-<a name="1.5.3"></a>
-## [1.5.3](https://github.com/macropeople/sasjs/compare/v1.5.2...v1.5.3) (2020-02-22)
-
-
-### Bug Fixes
-
-* capturing and parsing program code in Viya, plus replacement of console logs with console errors ([f4d6ac7](https://github.com/macropeople/sasjs/commit/f4d6ac7))
-
-
-
-<a name="1.5.2"></a>
-## [1.5.2](https://github.com/macropeople/sasjs/compare/v1.5.1...v1.5.2) (2020-02-22)
-
-
-
-<a name="1.5.1"></a>
-## [1.5.1](https://github.com/macropeople/sasjs/compare/v1.5.0...v1.5.1) (2020-02-21)
-
-
-### Bug Fixes
-
-* parse code only when log is available ([92fadff](https://github.com/macropeople/sasjs/commit/92fadff))
-
-
-
-<a name="1.5.0"></a>
-# [1.5.0](https://github.com/macropeople/sasjs/compare/v1.4.2...v1.5.0) (2020-02-21)
-
-
-### Bug Fixes
-
-* fetch login form data if not available ([d7e7b2f](https://github.com/macropeople/sasjs/commit/d7e7b2f))
-* revert unnecessary change ([34ed2a0](https://github.com/macropeople/sasjs/commit/34ed2a0))
-
-
-### Features
-
-* add checkSession API ([dc170fe](https://github.com/macropeople/sasjs/commit/dc170fe))
-
-
-
-<a name="1.4.2"></a>
-## [1.4.2](https://github.com/macropeople/sasjs/compare/v1.4.0...v1.4.2) (2020-02-20)
-
-
-### Bug Fixes
-
-* premature assignment of loginLink ([0c8a967](https://github.com/macropeople/sasjs/commit/0c8a967))
-
-
-
-<a name="1.4.0"></a>
-# [1.4.0](https://github.com/macropeople/sasjs/compare/v1.3.0...v1.4.0) (2020-02-20)
-
-
-### Bug Fixes
-
-* putting param export in right place ([6372ea2](https://github.com/macropeople/sasjs/commit/6372ea2))
-
-
-### Features
-
-* switching from file based upload to params for Viya.  Fixes [#13](https://github.com/macropeople/sasjs/issues/13) ([2aeba78](https://github.com/macropeople/sasjs/commit/2aeba78))
-
-
-
-<a name="1.3.0"></a>
-# 1.3.0 (2020-02-17)
-
-
-### Bug Fixes
-
-*  closes #issue6 ([efe1510](https://github.com/macropeople/sasjs/commit/efe1510)), closes [#issue6](https://github.com/macropeople/sasjs/issues/issue6)
-* add setter for debug state ([10945a6](https://github.com/macropeople/sasjs/commit/10945a6))
-* config renaming ([f8ace78](https://github.com/macropeople/sasjs/commit/f8ace78))
-
-
-### Features
-
-*  adding MIT license ([ef19e2a](https://github.com/macropeople/sasjs/commit/ef19e2a))
-* add parsing of source and generated code from response ([892122a](https://github.com/macropeople/sasjs/commit/892122a))
-* add support for SAS9 responses ([96c31c8](https://github.com/macropeople/sasjs/commit/96c31c8))
-* code of conduct ([cf31ce6](https://github.com/macropeople/sasjs/commit/cf31ce6))
-* initial commit ([6957dac](https://github.com/macropeople/sasjs/commit/6957dac))