fix: sasjs-tests are passing on sas9 except one

2025-12-11 09:24:35 +00:00 · 2023-02-09 22:04:47 +05:00
51 changed files with 2411 additions and 3836 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -106,16 +106,6 @@
        "userTesting",
        "doc"
      ]
-    },
-    {
-      "login": "saramartinelli1992",
-      "name": "Sara",
-      "avatar_url": "https://avatars.githubusercontent.com/u/100193908?v=4",
-      "profile": "https://github.com/saramartinelli1992",
-      "contributions": [
-        "userTesting",
-        "platform"
-      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,12 +0,0 @@
-## Expected behaviour
-*Describe what should be happening*
-
-## Current behaviour
-*Describe what is actually happening* 
-
-## Environment info
-**Client tech stack**: *Angular, React, Vue, VanillaJS, NodeJS etc.*
-**Server type**: SASJS|SASVIYA|SAS9
-**Login mechanism**: Default|Redirected
-**Debug**: true|false
-**Use Compute Api (relevant only on VIYA)**: true|false
--- a/README.md
+++ b/README.md
@@ -153,14 +153,6 @@ The response object will contain returned tables and columns.  Table names are a

 The adapter will also cache the logs (if debug enabled) and even the work tables.  For performance, it is best to keep debug mode off.

-### Session Manager
-
-To execute a script on Viya a session has to be created first which is time-consuming (~15sec). That is why a Session Manager has been created which is implementing the following logic:
-
-1. When the first session is requested, we also create one more session (hot session) for future requests. Please notice two pending POST requests to create a session within the same context: ![the first session request](./screenshots/session-manager-first-request.png)
-2. When a subsequent request for a session is received and there is a hot session available (not expired), this session is returned and an asynchronous request to create another hot session is sent. Please notice that there is a pending POST request to create a new session while a job has been already finished execution (POST request with status 201): ![subsequent session request](./screenshots/subsequent-session-request.png)
-3. When a subsequent request for a session is received and there is no available hot session, 2 requests are sent asynchronously to create a session. The first created session will be returned and another session will be reserved for future requests.
-
 ### Variable Types

 The SAS type (char/numeric) of the values is determined according to a set of rules:
@@ -340,7 +332,7 @@ If you find this library useful, help us grow our star graph!

 ## Contributors ✨
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-9-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -349,21 +341,18 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
 <table>
-  <tbody>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://krishna-acondy.io/"><img src="https://avatars.githubusercontent.com/u/2980428?v=4?s=100" width="100px;" alt="Krishna Acondy"/><br /><sub><b>Krishna Acondy</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=krishna-acondy" title="Code">💻</a> <a href="#infra-krishna-acondy" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#blog-krishna-acondy" title="Blogposts">📝</a> <a href="#content-krishna-acondy" title="Content">🖋</a> <a href="#ideas-krishna-acondy" title="Ideas, Planning, & Feedback">🤔</a> <a href="#video-krishna-acondy" title="Videos">📹</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.erudicat.com/"><img src="https://avatars.githubusercontent.com/u/25773492?v=4?s=100" width="100px;" alt="Yury Shkoda"/><br /><sub><b>Yury Shkoda</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=YuryShkoda" title="Code">💻</a> <a href="#infra-YuryShkoda" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#ideas-YuryShkoda" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/sasjs/adapter/commits?author=YuryShkoda" title="Tests">⚠️</a> <a href="#video-YuryShkoda" title="Videos">📹</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/medjedovicm"><img src="https://avatars.githubusercontent.com/u/18329105?v=4?s=100" width="100px;" alt="Mihajlo Medjedovic"/><br /><sub><b>Mihajlo Medjedovic</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=medjedovicm" title="Code">💻</a> <a href="#infra-medjedovicm" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/sasjs/adapter/commits?author=medjedovicm" title="Tests">⚠️</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3Amedjedovicm" title="Reviewed Pull Requests">👀</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/allanbowe"><img src="https://avatars.githubusercontent.com/u/4420615?v=4?s=100" width="100px;" alt="Allan Bowe"/><br /><sub><b>Allan Bowe</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=allanbowe" title="Code">💻</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3Aallanbowe" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/sasjs/adapter/commits?author=allanbowe" title="Tests">⚠️</a> <a href="#mentoring-allanbowe" title="Mentoring">🧑‍🏫</a> <a href="#maintenance-allanbowe" title="Maintenance">🚧</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/saadjutt01"><img src="https://avatars.githubusercontent.com/u/8914650?v=4?s=100" width="100px;" alt="Muhammad Saad "/><br /><sub><b>Muhammad Saad </b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=saadjutt01" title="Code">💻</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3Asaadjutt01" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/sasjs/adapter/commits?author=saadjutt01" title="Tests">⚠️</a> <a href="#mentoring-saadjutt01" title="Mentoring">🧑‍🏫</a> <a href="#infra-saadjutt01" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sabhas"><img src="https://avatars.githubusercontent.com/u/82647447?v=4?s=100" width="100px;" alt="Sabir Hassan"/><br /><sub><b>Sabir Hassan</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=sabhas" title="Code">💻</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3Asabhas" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/sasjs/adapter/commits?author=sabhas" title="Tests">⚠️</a> <a href="#ideas-sabhas" title="Ideas, Planning, & Feedback">🤔</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/VladislavParhomchik"><img src="https://avatars.githubusercontent.com/u/83717836?v=4?s=100" width="100px;" alt="VladislavParhomchik"/><br /><sub><b>VladislavParhomchik</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=VladislavParhomchik" title="Tests">⚠️</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3AVladislavParhomchik" title="Reviewed Pull Requests">👀</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://rudvfaden.github.io/"><img src="https://avatars.githubusercontent.com/u/2445577?v=4?s=100" width="100px;" alt="Rud Faden"/><br /><sub><b>Rud Faden</b></sub></a><br /><a href="#userTesting-rudvfaden" title="User Testing">📓</a> <a href="https://github.com/sasjs/adapter/commits?author=rudvfaden" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/saramartinelli1992"><img src="https://avatars.githubusercontent.com/u/100193908?v=4?s=100" width="100px;" alt="Sara"/><br /><sub><b>Sara</b></sub></a><br /><a href="#userTesting-saramartinelli1992" title="User Testing">📓</a> <a href="#platform-saramartinelli1992" title="Packaging/porting to new platform">📦</a></td>
-    </tr>
-  </tbody>
+  <tr>
+    <td align="center"><a href="https://krishna-acondy.io/"><img src="https://avatars.githubusercontent.com/u/2980428?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Krishna Acondy</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=krishna-acondy" title="Code">💻</a> <a href="#infra-krishna-acondy" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#blog-krishna-acondy" title="Blogposts">📝</a> <a href="#content-krishna-acondy" title="Content">🖋</a> <a href="#ideas-krishna-acondy" title="Ideas, Planning, & Feedback">🤔</a> <a href="#video-krishna-acondy" title="Videos">📹</a></td>
+    <td align="center"><a href="https://www.erudicat.com/"><img src="https://avatars.githubusercontent.com/u/25773492?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yury Shkoda</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=YuryShkoda" title="Code">💻</a> <a href="#infra-YuryShkoda" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#ideas-YuryShkoda" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/sasjs/adapter/commits?author=YuryShkoda" title="Tests">⚠️</a> <a href="#video-YuryShkoda" title="Videos">📹</a></td>
+    <td align="center"><a href="https://github.com/medjedovicm"><img src="https://avatars.githubusercontent.com/u/18329105?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mihajlo Medjedovic</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=medjedovicm" title="Code">💻</a> <a href="#infra-medjedovicm" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/sasjs/adapter/commits?author=medjedovicm" title="Tests">⚠️</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3Amedjedovicm" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/allanbowe"><img src="https://avatars.githubusercontent.com/u/4420615?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Allan Bowe</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=allanbowe" title="Code">💻</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3Aallanbowe" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/sasjs/adapter/commits?author=allanbowe" title="Tests">⚠️</a> <a href="#mentoring-allanbowe" title="Mentoring">🧑‍🏫</a> <a href="#maintenance-allanbowe" title="Maintenance">🚧</a></td>
+    <td align="center"><a href="https://github.com/saadjutt01"><img src="https://avatars.githubusercontent.com/u/8914650?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Muhammad Saad </b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=saadjutt01" title="Code">💻</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3Asaadjutt01" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/sasjs/adapter/commits?author=saadjutt01" title="Tests">⚠️</a> <a href="#mentoring-saadjutt01" title="Mentoring">🧑‍🏫</a> <a href="#infra-saadjutt01" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/sabhas"><img src="https://avatars.githubusercontent.com/u/82647447?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sabir Hassan</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=sabhas" title="Code">💻</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3Asabhas" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/sasjs/adapter/commits?author=sabhas" title="Tests">⚠️</a> <a href="#ideas-sabhas" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/VladislavParhomchik"><img src="https://avatars.githubusercontent.com/u/83717836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>VladislavParhomchik</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=VladislavParhomchik" title="Tests">⚠️</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3AVladislavParhomchik" title="Reviewed Pull Requests">👀</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="http://rudvfaden.github.io/"><img src="https://avatars.githubusercontent.com/u/2445577?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rud Faden</b></sub></a><br /><a href="#userTesting-rudvfaden" title="User Testing">📓</a> <a href="https://github.com/sasjs/adapter/commits?author=rudvfaden" title="Documentation">📖</a></td>
+  </tr>
 </table>

 <!-- markdownlint-restore -->
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -59,12 +59,12 @@
    "jest-extended": "2.0.0",
    "node-polyfill-webpack-plugin": "1.1.4",
    "path": "0.12.7",
-    "pem": "1.14.5",
+    "pem": "1.14.6",
    "prettier": "2.7.1",
    "process": "0.11.10",
    "rimraf": "3.0.2",
    "semantic-release": "19.0.3",
-    "terser-webpack-plugin": "5.3.6",
+    "terser-webpack-plugin": "5.3.1",
    "ts-jest": "27.1.3",
    "ts-loader": "9.4.0",
    "tslint": "6.1.3",
@@ -72,7 +72,7 @@
    "typedoc": "0.23.24",
    "typedoc-plugin-rename-defaults": "0.6.4",
    "typescript": "4.8.3",
-    "webpack": "5.76.2",
+    "webpack": "5.69.0",
    "webpack-cli": "4.9.2"
  },
  "main": "index.js",
--- a/sasjs-tests/.gitignore
+++ b/sasjs-tests/.gitignore
@@ -21,6 +21,3 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-
-sasjsbuild
-sasjsresults
--- a/sasjs-tests/.sasjslint
+++ b/sasjs-tests/.sasjslint
@@ -1,19 +0,0 @@
-{
-  "lineEndings": "off",
-  "noTrailingSpaces": true,
-  "noEncodedPasswords": true,
-  "hasDoxygenHeader": true,
-  "noSpacesInFileNames": true,
-  "lowerCaseFileNames": true,
-  "maxLineLength": 80,
-  "maxHeaderLineLength": 80,
-  "maxDataLineLength": 80,
-  "noTabIndentation": true,
-  "indentationMultiple": 2,
-  "hasMacroNameInMend": true,
-  "noNestedMacros": true,
-  "hasMacroParentheses": true,
-  "strictMacroDefinition": true,
-  "noGremlins": true,
-  "defaultHeader": "/**{lineEnding}  @file{lineEnding}  @brief <Your brief here>{lineEnding}  <h4> SAS Macros </h4>{lineEnding}**/"
-}
--- a/sasjs-tests/README.md
+++ b/sasjs-tests/README.md
@@ -65,7 +65,6 @@ The code below will work on ALL SAS platforms (Viya, SAS 9 EBI, SASjs Server).
 ```sas
 filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 %inc mc;
-%let apploc=/Public/app/adapter-tests;
 filename ft15f001 temp lrecl=1000;
 parmcards4;
  %webout(FETCH)
@@ -81,7 +80,7 @@ parmcards4;
  %mend; %x()
  %webout(CLOSE)
 ;;;;
-%mx_createwebservice(path=&apploc/services/common,name=sendObj)
+%mx_createwebservice(path=/Public/app/common,name=sendObj)
 parmcards4;
  %webout(FETCH)
  %webout(OPEN)
@@ -96,7 +95,7 @@ parmcards4;
  %mend; %x()
  %webout(CLOSE)
 ;;;;
-%mx_createwebservice(path=&apploc/services/common,name=sendArr)
+%mx_createwebservice(path=/Public/app/common,name=sendArr)
 parmcards4;
  data work.macvars;
    set sashelp.vmacro;
@@ -105,14 +104,14 @@ parmcards4;
  %webout(OBJ,macvars) 
  %webout(CLOSE)
 ;;;;
-%mx_createwebservice(path=&apploc/services/common,name=sendMacVars)
+%mx_createwebservice(path=/Public/app/common,name=sendMacVars)
 parmcards4;
 If you can keep your head when all about you
    Are losing theirs and blaming it on you,
 If you can trust yourself when all men doubt you,
    But make allowance for their doubting too;
 ;;;;
-%mx_createwebservice(path=&apploc/services/common,name=makeErr)
+%mx_createwebservice(path=/Public/app/common,name=makeErr)
 parmcards4;
 %webout(OPEN)
 data _null_;
@@ -121,7 +120,7 @@ data _null_;
 run;
 %webout(CLOSE)
 ;;;;
-%mx_createwebservice(path=&apploc/services/common,name=invalidJSON)
+%mx_createwebservice(path=/Public/app/common,name=invalidJSON)
 ```

 You should now be able to access the tests in your browser at the deployed path on your server.
--- a/sasjs-tests/public/config.json
+++ b/sasjs-tests/public/config.json
@@ -3,8 +3,8 @@
  "password": "",
  "sasJsConfig": {
    "serverUrl": "",
-    "appLoc": "/Public/app/adapter-tests",
-    "serverType": "SASJS",
+    "appLoc": "/Public/app",
+    "serverType": "SASVIYA",
    "debug": false,
    "contextName": "sasjs adapter compute context",
    "useComputeApi": true
--- a/sasjs-tests/sasjs/common/invalidJSON.sas
+++ b/sasjs-tests/sasjs/common/invalidJSON.sas
@@ -1,13 +0,0 @@
-/**
-  @file
-  @brief Makes an invalid JSON file
-
-  <h4> SAS Macros </h4>
-**/
-
-%webout(OPEN)
-data _null_;
-  file _webout;
-  put ' the discovery channel ';
-run;
-%webout(CLOSE)
--- a/sasjs-tests/sasjs/common/makeErr.sas
+++ b/sasjs-tests/sasjs/common/makeErr.sas
@@ -1,11 +0,0 @@
-/**
-  @file
-  @brief Makes an error
-
-  <h4> SAS Macros </h4>
-**/
-
-If you can keep your head when all about you
-    Are losing theirs and blaming it on you,
-If you can trust yourself when all men doubt you,
-    But make allowance for their doubting too;
--- a/sasjs-tests/sasjs/common/sendArr.sas
+++ b/sasjs-tests/sasjs/common/sendArr.sas
@@ -1,21 +0,0 @@
-/**
-  @file
-  @brief Returns JSON in Array format
-
-  <h4> SAS Macros </h4>
-**/
-
-%webout(FETCH)
-%webout(OPEN)
-%macro x();
-  %if %symexist(sasjs_tables) %then
-  %do i=1 %to %sysfunc(countw(&sasjs_tables));
-    %let table=%scan(&sasjs_tables,&i);
-    %webout(ARR,&table,missing=STRING,showmeta=YES)
-  %end;
-  %else %do i=1 %to &_webin_file_count;
-    %webout(ARR,&&_webin_name&i,missing=STRING,showmeta=YES)
-  %end;
-%mend x;
-%x()
-%webout(CLOSE)
--- a/sasjs-tests/sasjs/common/sendMacVars.sas
+++ b/sasjs-tests/sasjs/common/sendMacVars.sas
@@ -1,13 +0,0 @@
-/**
-  @file
-  @brief Returns Macro Variables
-
-  <h4> SAS Macros </h4>
-**/
-
-data work.macvars;
-  set sashelp.vmacro;
-run;
-%webout(OPEN)
-%webout(OBJ,macvars)
-%webout(CLOSE)
--- a/sasjs-tests/sasjs/common/sendObj.sas
+++ b/sasjs-tests/sasjs/common/sendObj.sas
@@ -1,21 +0,0 @@
-/**
-  @file
-  @brief Returns JSON in Object format
-
-  <h4> SAS Macros </h4>
-**/
-
-%webout(FETCH)
-%webout(OPEN)
-%macro x();
-  %if %symexist(sasjs_tables) %then
-  %do i=1 %to %sysfunc(countw(&sasjs_tables));
-    %let table=%scan(&sasjs_tables,&i);
-    %webout(OBJ,&table,missing=STRING,showmeta=YES)
-  %end;
-  %else %do i=1 %to &_webin_file_count;
-    %webout(OBJ,&&_webin_name&i,missing=STRING,showmeta=YES)
-  %end;
-%mend x;
-%x()
-%webout(CLOSE)
--- a/sasjs-tests/sasjs/doxy/Doxyfile
+++ b/sasjs-tests/sasjs/doxy/Doxyfile
@@ -1,40 +0,0 @@
-ALPHABETICAL_INDEX     = NO
-
-ENABLE_PREPROCESSING   = NO
-EXTENSION_MAPPING      = sas=Java ddl=Java
-EXTRACT_LOCAL_CLASSES  = NO
-FILE_PATTERNS          = *.sas \
-                         *.ddl \
-                         *.dox
-GENERATE_LATEX         = NO
-GENERATE_TREEVIEW      = YES
-HIDE_FRIEND_COMPOUNDS  = YES
-HIDE_IN_BODY_DOCS      = YES
-HIDE_SCOPE_NAMES       = YES
-HIDE_UNDOC_CLASSES     = YES
-HIDE_UNDOC_MEMBERS     = YES
-HTML_OUTPUT            = $(DOXY_HTML_OUTPUT)
-HTML_HEADER            = $(HTML_HEADER)
-HTML_EXTRA_FILES       = $(HTML_EXTRA_FILES)
-HTML_FOOTER            = $(HTML_FOOTER)
-HTML_EXTRA_STYLESHEET  = $(HTML_EXTRA_STYLESHEET)
-INHERIT_DOCS           = NO
-INLINE_INFO            = NO
-INPUT                  = $(DOXY_INPUT)
-LAYOUT_FILE            = $(LAYOUT_FILE)
-USE_MDFILE_AS_MAINPAGE = README.md
-MAX_INITIALIZER_LINES  = 0
-PROJECT_NAME           = $(PROJECT_NAME)
-PROJECT_LOGO           = $(PROJECT_LOGO)
-PROJECT_BRIEF          = $(PROJECT_BRIEF)
-RECURSIVE              = YES
-REPEAT_BRIEF           = NO
-SHOW_NAMESPACES        = NO
-SHOW_USED_FILES        = NO
-SOURCE_BROWSER         = YES
-SOURCE_TOOLTIPS        = NO
-STRICT_PROTO_MATCHING  = YES
-STRIP_CODE_COMMENTS    = NO
-SUBGROUPING            = NO
-TAB_SIZE               = 2
-VERBATIM_HEADERS       = NO
--- a/sasjs-tests/sasjs/doxy/DoxygenLayout.xml
+++ b/sasjs-tests/sasjs/doxy/DoxygenLayout.xml
@@ -1,112 +0,0 @@
-<doxygenlayout version="1.0">
-  <!-- Generated by doxygen 1.8.14 -->
-  <!-- Navigation index tabs for HTML output -->
-  <navindex>
-    <tab type="mainpage" visible="yes" title="Home"/>
-    <tab type="pages" visible="no" title="" intro=""/>
-    <tab type="modules" visible="no" title="" intro=""/>
-    <tab type="namespaces" visible="no" title="">
-      <tab type="namespacelist" visible="no" title="" intro=""/>
-      <tab type="namespacemembers" visible="no" title="" intro=""/>
-    </tab>
-    <tab type="classes" visible="no" title="">
-      <tab type="classlist" visible="no" title="" intro=""/>
-      <tab type="classindex" visible="no" title=""/>
-      <tab type="hierarchy" visible="no" title="" intro=""/>
-      <tab type="classmembers" visible="no" title="" intro=""/>
-    </tab>
-
-    <tab type="filelist" visible="yes" title="" intro="List of Files"/>
-
-    <tab type="examples" visible="no" title="" intro=""/>
-    <tab type="user" url="data_lineage.svg" title="Lineage"/>
-  </navindex>
-
-
-  <!-- Layout definition for a file page -->
-  <file>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <includegraph visible="$INCLUDE_GRAPH"/>
-    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
-    <sourcelink visible="yes"/>
-    <memberdecl>
-      <classes visible="no" title=""/>
-      <namespaces visible="no" title=""/>
-      <constantgroups visible="no" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="no"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-    </memberdef>
-    <authorsection/>
-  </file>
-
-  <!-- Layout definition for a group page -->
-  <group>
-    <briefdescription visible="no"/>
-    <groupgraph visible="$GROUP_GRAPHS"/>
-    <memberdecl>
-      <nestedgroups visible="no" title=""/>
-      <dirs visible="yes" title=""/>
-      <files visible="yes" title=""/>
-      <namespaces visible="no" title=""/>
-      <classes visible="no" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <pagedocs/>
-      <inlineclasses title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </group>
-
-  <!-- Layout definition for a directory page -->
-  <directory>
-    <briefdescription visible="yes"/>
-    <detaileddescription visible="yes" title=""/>
-    <directorygraph visible="yes"/>
-    <memberdecl>
-      <dirs visible="yes"/>
-      <files visible="yes"/>
-    </memberdecl>
-  </directory>
-</doxygenlayout>
--- a/sasjs-tests/sasjs/doxy/doxygen.svg
+++ b/sasjs-tests/sasjs/doxy/doxygen.svg
--- a/sasjs-tests/sasjs/doxy/favicon.ico
+++ b/sasjs-tests/sasjs/doxy/favicon.ico
--- a/sasjs-tests/sasjs/doxy/logo.png
+++ b/sasjs-tests/sasjs/doxy/logo.png
--- a/sasjs-tests/sasjs/doxy/new_footer.html
+++ b/sasjs-tests/sasjs/doxy/new_footer.html
@@ -1,33 +0,0 @@
-<!-- HTML footer for doxygen 1.8.17-->
-<!-- start footer part -->
-<!--BEGIN GENERATE_TREEVIEW-->
-<div id="nav-path" class="navpath">
-  <!-- id is needed for treeview function! -->
-  <ul>
-    $navpath
-    <li class="footer">
-      $generatedby
-      <a href="https://www.doxygen.org/index.html">
-        <img class="footer" src="$relpath^doxygen.svg" alt="doxygen"
-      /></a>
-      $doxygenversion
-    </li>
-    <li>
-      <i> For more information visit the </i>
-      <a href="https://cli.sasjs.io">SASjs cli</a> documentation.
-    </li>
-  </ul>
-</div>
-<!--END GENERATE_TREEVIEW-->
-<!--BEGIN !GENERATE_TREEVIEW-->
-<hr class="footer" />
-<address class="footer">
-  <small>
-    $generatedby &#160;<a href="http://www.doxygen.org/index.html">
-      <img class="footer" src="$relpath^doxygen.svg" alt="doxygen" />
-    </a>
-    $doxygenversion
-  </small>
-</address>
-
-<!--END !GENERATE_TREEVIEW-->
--- a/sasjs-tests/sasjs/doxy/new_header.html
+++ b/sasjs-tests/sasjs/doxy/new_header.html
@@ -1,57 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- HTML header for doxygen 1.8.17-->
-<html xmlns="https://www.w3.org/1999/xhtml" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=9" />
-    <meta name="generator" content="Doxygen $doxygenversion" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <!--BEGIN PROJECT_NAME-->
-    <title>$projectname: $title</title>
-    <meta name="description" content="$projectbrief" />
-    <!--END PROJECT_NAME-->
-    <!--BEGIN !PROJECT_NAME-->
-    <title>$title</title>
-    <!--END !PROJECT_NAME-->
-    <link href="$relpath^tabs.css" rel="stylesheet" type="text/css" />
-    <script type="text/javascript" src="$relpath^jquery.js"></script>
-    <script type="text/javascript" src="$relpath^dynsections.js"></script>
-    $treeview $search $mathjax
-    <link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
-    <link rel="shortcut icon" href="$relpath^favicon.ico" type="image/x-icon" />
-    $extrastylesheet
-  </head>
-  <body>
-    <div id="top">
-      <!-- do not remove this div, it is closed by doxygen! -->
-
-      <!--BEGIN TITLEAREA-->
-      <div id="titlearea">
-        <table cellspacing="0" cellpadding="0">
-          <tbody>
-            <tr style="height: 56px">
-              <!--BEGIN PROJECT_LOGO-->
-              <td id="projectlogo">
-                <a href="$relpath^"
-                  ><img alt="Logo" src="$relpath^$projectlogo"
-                /></a>
-              </td>
-              <!--END PROJECT_LOGO-->
-              <td id="projectalign" style="padding-left: 0.5em">
-                <div id="projectname">$projectname</div>
-                <div id="projectbrief">$projectbrief</div>
-              </td>
-              <!--BEGIN DISABLE_INDEX-->
-              <!--BEGIN SEARCHENGINE-->
-              <td>$searchbox</td>
-              <!--END SEARCHENGINE-->
-              <!--END DISABLE_INDEX-->
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <!--END TITLEAREA-->
-      <!-- end header part -->
-    </div>
-  </body>
-</html>
--- a/sasjs-tests/sasjs/doxy/new_stylesheet.css
+++ b/sasjs-tests/sasjs/doxy/new_stylesheet.css
@@ -1,4 +0,0 @@
-#projectlogo img {
-  border: 0px none;
-  max-height: 70px;
-}
--- a/sasjs-tests/sasjs/sasjsconfig.json
+++ b/sasjs-tests/sasjs/sasjsconfig.json
@@ -1,17 +0,0 @@
-{
-  "$schema": "https://cli.sasjs.io/sasjsconfig-schema.json",
-  "serviceConfig": {
-    "serviceFolders": [
-      "sasjs/common"
-    ]
-  },
-  "defaultTarget": "4gl",
-  "targets": [
-    {
-      "name": "4gl",
-      "serverType": "SASJS",
-      "serverUrl": "https://sas9.4gl.io",
-      "appLoc": "/Public/app/adapter-tests"
-    }
-  ]
-}
--- a/sasjs-tests/src/testSuites/Basic.ts
+++ b/sasjs-tests/src/testSuites/Basic.ts
@@ -53,7 +53,9 @@ export const basicTests = (
        return await newAdapterIns.checkSession()
      },
      assertion: (response: any) =>
-        response?.isLoggedIn && response?.userName === userName
+        adapter.getSasjsConfig().serverType === ServerType.Sas9
+          ? response?.isLoggedIn
+          : response?.isLoggedIn && response?.userName === userName
    },
    {
      title: 'Multiple Log in attempts',
--- a/sasjs-tests/src/testSuites/Compute.ts
+++ b/sasjs-tests/src/testSuites/Compute.ts
@@ -48,7 +48,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
      test: () => {
        const data: any = { table1: [{ col1: 'first col value' }] }
        return adapter.startComputeJob(
-          '/Public/app/adapter-tests/services/common/sendArr',
+          '/Public/app/common/sendArr',
          data,
          {},
          undefined,
--- a/screenshots/session-manager-first-request.png
+++ b/screenshots/session-manager-first-request.png
--- a/screenshots/subsequent-session-request.png
+++ b/screenshots/subsequent-session-request.png
--- a/src/SASViyaApiClient.ts
+++ b/src/SASViyaApiClient.ts
@@ -548,7 +548,6 @@ export class SASViyaApiClient {

  /**
   * Exchanges the refresh token for an access token for the given client.
-   * This method can only be used by Node.
   * @param clientId - the client ID to authenticate with.
   * @param clientSecret - the client secret to authenticate with.
   * @param refreshToken - the refresh token received from the server.
--- a/src/SASjs.ts
+++ b/src/SASjs.ts
@@ -4,7 +4,8 @@ import {
  UploadFile,
  EditContextInput,
  PollOptions,
-  LoginMechanism
+  LoginMechanism,
+  ExecutionQuery
 } from './types'
 import { SASViyaApiClient } from './SASViyaApiClient'
 import { SAS9ApiClient } from './SAS9ApiClient'
@@ -16,6 +17,7 @@ import {
  AuthConfig,
  ExtraResponseAttributes,
  SasAuthResponse,
+  ServicePackSASjs,
  AuthConfigSas9
 } from '@sasjs/utils/types'
 import { RequestClient } from './request/RequestClient'
@@ -893,7 +895,6 @@ export default class SASjs {
    await this.computeJobExecutor?.resendWaitingRequests()
    await this.jesJobExecutor?.resendWaitingRequests()
    await this.fileUploader?.resendWaitingRequests()
-    await this.sasjsJobExecutor?.resendWaitingRequests()
  }

  /**
--- a/src/SASjsApiClient.ts
+++ b/src/SASjsApiClient.ts
@@ -1,24 +1,11 @@
 import * as NodeFormData from 'form-data'
 import { AuthConfig, ServerType, ServicePackSASjs } from '@sasjs/utils/types'
-import { prefixMessage } from '@sasjs/utils/error'
 import { ExecutionQuery } from './types'
 import { RequestClient } from './request/RequestClient'
 import { getAccessTokenForSasjs } from './auth/getAccessTokenForSasjs'
 import { refreshTokensForSasjs } from './auth/refreshTokensForSasjs'
 import { getTokens } from './auth/getTokens'

-// TODO: move to sasjs/utils
-export interface SASjsAuthResponse {
-  access_token: string
-  refresh_token: string
-}
-
-export interface ScriptExecutionResult {
-  log: string
-  webout?: string
-  printOutput?: string
-}
-
 export class SASjsApiClient {
  constructor(private requestClient: RequestClient) {}

@@ -131,28 +118,18 @@ export class SASjsApiClient {
    code: string,
    runTime: string = 'sas',
    authConfig?: AuthConfig
-  ): Promise<ScriptExecutionResult> {
+  ) {
    const access_token = await this.getAccessTokenForRequest(authConfig)
-    const executionResult: ScriptExecutionResult = { log: '' }
+
+    let parsedSasjsServerLog = ''

    await this.requestClient
      .post('SASjsApi/code/execute', { code, runTime }, access_token)
      .then((res: any) => {
-        const { log, printOutput, result: webout } = res
-
-        executionResult.log = log
-
-        if (printOutput) executionResult.printOutput = printOutput
-        if (webout) executionResult.webout = webout
-      })
-      .catch((err) => {
-        throw prefixMessage(
-          err,
-          'Error while sending POST request to execute code. '
-        )
+        if (res.log) parsedSasjsServerLog = res.log
      })

-    return executionResult
+    return parsedSasjsServerLog
  }

  /**
@@ -175,3 +152,9 @@ export class SASjsApiClient {
    return refreshTokensForSasjs(this.requestClient, refreshToken)
  }
 }
+
+// todo move to sasjs/utils
+export interface SASjsAuthResponse {
+  access_token: string
+  refresh_token: string
+}
--- a/src/SessionManager.ts
+++ b/src/SessionManager.ts
@@ -6,10 +6,6 @@ import { RequestClient } from './request/RequestClient'

 const MAX_SESSION_COUNT = 1

-interface ApiErrorResponse {
-  response: { status: number | string; data: { message: string } }
-}
-
 export class SessionManager {
  private loggedErrors: NoSessionStateError[] = []

@@ -21,10 +17,8 @@ export class SessionManager {
    if (serverUrl) isUrl(serverUrl)
  }

-  // INFO: session pool
  private sessions: Session[] = []
  private currentContext: Context | null = null
-  private settingContext: boolean = false
  private _debug: boolean = false
  private printedSessionState = {
    printed: false,
@@ -39,230 +33,71 @@ export class SessionManager {
    this._debug = value
  }

-  /**
-   * Checks if session is valid. Session is considered valid if time since it's creation is less than 'sessionInactiveTimeout' attribute.
-   * @param session - session object.
-   * @returns - boolean indicating if session is valid.
-   */
-  private isSessionValid(session: Session): boolean {
-    if (!session) return false
-
+  async getSession(accessToken?: string) {
+    await this.createSessions(accessToken)
+    await this.createAndWaitForSession(accessToken)
+    const session = this.sessions.pop()
    const secondsSinceSessionCreation =
-      (new Date().getTime() - new Date(session.creationTimeStamp).getTime()) /
+      (new Date().getTime() - new Date(session!.creationTimeStamp).getTime()) /
      1000

    if (
      !session!.attributes ||
      secondsSinceSessionCreation >= session!.attributes.sessionInactiveTimeout
    ) {
-      return false
-    } else {
-      return true
-    }
-  }
+      await this.createSessions(accessToken)
+      const freshSession = this.sessions.pop()

-  /**
-   * Removes session from pool of hot sessions.
-   * @param session - session object.
-   * @returns - void.
-   */
-  private removeSessionFromPool(session: Session): void {
-    this.sessions = this.sessions.filter((ses) => ses.id !== session.id)
-  }
-
-  /**
-   * Filters session pool to keep only valid sessions.
-   * @param session - session object.
-   * @returns - void.
-   */
-  private removeExpiredSessions(): void {
-    this.sessions = this.sessions.filter((session) =>
-      this.isSessionValid(session)
-    )
-  }
-
-  /**
-   * Throws set of errors as a single error.
-   * @param errors - array of errors or string.
-   * @param prefix - an optional final error prefix.
-   * @returns - never.
-   */
-  private throwErrors(errors: (Error | string)[], prefix?: string): never {
-    throw prefix
-      ? prefixMessage(new Error(errors.join('. ')), prefix)
-      : new Error(
-          errors
-            .map((err) =>
-              (err as Error).message ? (err as Error).message : err
-            )
-            .join('. ')
-        )
-  }
-
-  /**
-   * Returns session.
-   * If there is a hot session available, it will be returned immediately and an asynchronous request to create new hot session will be submitted.
-   * If there is no available session, 2 session creation requests will be submitted. The session is returned once it is created and ready.
-   * @param accessToken - an optional access token.
-   * @returns - a promise which resolves with a session.
-   */
-  async getSession(accessToken?: string) {
-    const errors: (Error | string)[] = []
-    let isErrorThrown = false
-
-    const throwIfError = () => {
-      if (errors.length && !isErrorThrown) {
-        isErrorThrown = true
-
-        this.throwErrors(errors)
-      }
+      return freshSession
    }

-    this.removeExpiredSessions()
-
-    if (this.sessions.length) {
-      const session = this.sessions[0]
-
-      this.removeSessionFromPool(session)
-
-      this.createSessions(accessToken).catch((err) => {
-        errors.push(err)
-      })
-
-      this.createAndWaitForSession(accessToken).catch((err) => {
-        errors.push(err)
-      })
-
-      throwIfError()
-
-      return session
-    } else {
-      this.createSessions(accessToken).catch((err) => {
-        errors.push(err)
-      })
-
-      await this.createAndWaitForSession(accessToken).catch((err) => {
-        errors.push(err)
-      })
-
-      this.removeExpiredSessions()
-
-      const session = this.sessions.pop()!
-
-      this.removeSessionFromPool(session)
-
-      throwIfError()
-
-      return session
-    }
+    return session
  }

-  /**
-   * Returns error message based on the response from SAS API.
-   * @param err - an optional access token.
-   * @param accessToken - an optional access token.
-   * @returns - an error message.
-   */
-  private getErrorMessage(
-    err: ApiErrorResponse,
-    url: string,
-    method: 'GET' | 'POST' | 'DELETE'
-  ) {
-    return (
-      `${method} request to ${url} failed with status code ${
-        err.response.status || 'unknown'
-      }. ` + err.response.data.message || ''
-    )
-  }
-
-  /**
-   * Deletes session.
-   * @param id - a session id.
-   * @param accessToken - an optional access token.
-   * @returns - a promise which resolves when session is deleted.
-   */
-  async clearSession(id: string, accessToken?: string): Promise<void> {
-    const url = `/compute/sessions/${id}`
-
+  async clearSession(id: string, accessToken?: string) {
    return await this.requestClient
-      .delete<Session>(url, accessToken)
+      .delete<Session>(`/compute/sessions/${id}`, accessToken)
      .then(() => {
        this.sessions = this.sessions.filter((s) => s.id !== id)
      })
-      .catch((err: ApiErrorResponse) => {
-        throw prefixMessage(
-          this.getErrorMessage(err, url, 'DELETE'),
-          'Error while deleting session. '
-        )
+      .catch((err) => {
+        throw prefixMessage(err, 'Error while deleting session. ')
      })
  }

-  /**
-   * Creates sessions in amount equal to MAX_SESSION_COUNT.
-   * @param accessToken - an optional access token.
-   * @returns - a promise which resolves when required amount of sessions is created.
-   */
-  private async createSessions(accessToken?: string): Promise<void> {
-    const errors: (Error | string)[] = []
-
+  private async createSessions(accessToken?: string) {
    if (!this.sessions.length) {
-      await asyncForEach(new Array(MAX_SESSION_COUNT), async () => {
-        await this.createAndWaitForSession(accessToken).catch((err) => {
-          errors.push(err)
+      if (!this.currentContext) {
+        await this.setCurrentContext(accessToken).catch((err) => {
+          throw err
        })
+      }
+
+      await asyncForEach(new Array(MAX_SESSION_COUNT), async () => {
+        const createdSession = await this.createAndWaitForSession(
+          accessToken
+        ).catch((err) => {
+          throw err
+        })
+
+        this.sessions.push(createdSession)
+      }).catch((err) => {
+        throw err
      })
    }
-
-    if (errors.length) {
-      this.throwErrors(errors, 'Error while creating session. ')
-    }
  }

-  /**
-   * Waits for the current context to be set.
-   * @returns - a promise which resolves when current context is set.
-   */
-  private async waitForCurrentContext(): Promise<void> {
-    return new Promise((resolve) => {
-      const timer = setInterval(() => {
-        if (this.currentContext) {
-          this.settingContext = false
-
-          clearInterval(timer)
-
-          resolve()
-        }
-      }, 100)
-    })
-  }
-
-  /**
-   * Creates and waits for session to be ready.
-   * @param accessToken - an optional access token.
-   * @returns - a promise which resolves with a session.
-   */
-  private async createAndWaitForSession(
-    accessToken?: string
-  ): Promise<Session> {
-    if (!this.currentContext) {
-      if (!this.settingContext) {
-        await this.setCurrentContext(accessToken)
-      } else {
-        await this.waitForCurrentContext()
-      }
-    }
-
-    const url = `${this.serverUrl}/compute/contexts/${
-      this.currentContext!.id
-    }/sessions`
-
+  private async createAndWaitForSession(accessToken?: string) {
    const { result: createdSession, etag } = await this.requestClient
-      .post<Session>(url, {}, accessToken)
-      .catch((err: ApiErrorResponse) => {
-        throw prefixMessage(
-          this.getErrorMessage(err, url, 'POST'),
-          `Error while creating session. `
-        )
+      .post<Session>(
+        `${this.serverUrl}/compute/contexts/${
+          this.currentContext!.id
+        }/sessions`,
+        {},
+        accessToken
+      )
+      .catch((err) => {
+        throw err
      })

    await this.waitForSession(createdSession, etag, accessToken)
@@ -272,26 +107,14 @@ export class SessionManager {
    return createdSession
  }

-  /**
-   * Sets current context.
-   * @param accessToken - an optional access token.
-   * @returns - a promise which resolves when current context is set.
-   */
-  private async setCurrentContext(accessToken?: string): Promise<void> {
+  private async setCurrentContext(accessToken?: string) {
    if (!this.currentContext) {
-      const url = `${this.serverUrl}/compute/contexts?limit=10000`
-
-      this.settingContext = true
-
      const { result: contexts } = await this.requestClient
        .get<{
          items: Context[]
-        }>(url, accessToken)
-        .catch((err: ApiErrorResponse) => {
-          throw prefixMessage(
-            this.getErrorMessage(err, url, 'GET'),
-            `Error while getting list of contexts. `
-          )
+        }>(`${this.serverUrl}/compute/contexts?limit=10000`, accessToken)
+        .catch((err) => {
+          throw err
        })

      const contextsList =
@@ -315,13 +138,18 @@ export class SessionManager {
    }
  }

-  /**
-   * Waits for session to be ready.
-   * @param session - a session object.
-   * @param etag - an etag that can be a string or null.
-   * @param accessToken - an optional access token.
-   * @returns - a promise which resolves with a session state.
-   */
+  private getHeaders(accessToken?: string) {
+    const headers: any = {
+      'Content-Type': 'application/json'
+    }
+
+    if (accessToken) {
+      headers.Authorization = `Bearer ${accessToken}`
+    }
+
+    return headers
+  }
+
  private async waitForSession(
    session: Session,
    etag: string | null,
@@ -345,11 +173,13 @@ export class SessionManager {
          this.printedSessionState.printed = true
        }

-        const url = `${this.serverUrl}${stateLink.href}?wait=30`
-
        const { result: state, responseStatus: responseStatus } =
-          await this.getSessionState(url, etag!, accessToken).catch((err) => {
-            throw prefixMessage(err, 'Error while waiting for session. ')
+          await this.getSessionState(
+            `${this.serverUrl}${stateLink.href}?wait=30`,
+            etag!,
+            accessToken
+          ).catch((err) => {
+            throw prefixMessage(err, 'Error while getting session state.')
          })

        sessionState = state.trim()
@@ -386,7 +216,7 @@ export class SessionManager {

        return sessionState
      } else {
-        throw 'Error while getting session state link. '
+        throw 'Error while getting session state link.'
      }
    } else {
      this.loggedErrors = []
@@ -395,21 +225,11 @@ export class SessionManager {
    }
  }

-  /**
-   * Gets session state.
-   * @param url - a URL to get session state.
-   * @param etag - an etag string.
-   * @param accessToken - an optional access token.
-   * @returns - a promise which resolves with a result string and response status.
-   */
  private async getSessionState(
    url: string,
    etag: string,
    accessToken?: string
-  ): Promise<{
-    result: string
-    responseStatus: number
-  }> {
+  ) {
    return await this.requestClient
      .get(url, accessToken, 'text/plain', { 'If-None-Match': etag })
      .then((res) => ({
@@ -417,37 +237,20 @@ export class SessionManager {
        responseStatus: res.status
      }))
      .catch((err) => {
-        throw prefixMessage(
-          this.getErrorMessage(err, url, 'GET'),
-          'Error while getting session state. '
-        )
+        throw err
      })
  }

-  /**
-   * Gets variable.
-   * @param sessionId - a session id.
-   * @param variable - a variable string.
-   * @param accessToken - an optional access token.
-   * @returns - a promise which resolves with a result that confirms to SessionVariable interface, etag string and status code.
-   */
-  async getVariable(
-    sessionId: string,
-    variable: string,
-    accessToken?: string
-  ): Promise<{
-    result: SessionVariable
-    etag: string
-    status: number
-  }> {
-    const url = `${this.serverUrl}/compute/sessions/${sessionId}/variables/${variable}`
-
+  async getVariable(sessionId: string, variable: string, accessToken?: string) {
    return await this.requestClient
-      .get<SessionVariable>(url, accessToken)
+      .get<SessionVariable>(
+        `${this.serverUrl}/compute/sessions/${sessionId}/variables/${variable}`,
+        accessToken
+      )
      .catch((err) => {
        throw prefixMessage(
-          this.getErrorMessage(err, url, 'GET'),
-          `Error while fetching session variable '${variable}'. `
+          err,
+          `Error while fetching session variable '${variable}'.`
        )
      })
  }
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -1,6 +1,5 @@
 import { ServerType } from '@sasjs/utils/types'
 import { RequestClient } from '../request/RequestClient'
-import { NotFoundError } from '../types/errors'
 import { LoginOptions, LoginResult, LoginResultInternal } from '../types/Login'
 import { serialize } from '../utils'
 import { extractUserLongNameSas9 } from '../utils/sas9/extractUserLongNameSas9'
@@ -13,7 +12,7 @@ export class AuthManager {
  public userLongName = ''
  private loginUrl: string
  private logoutUrl: string
-  private redirectedLoginUrl = `/SASLogon` //SAS 9 M8 no longer redirects from `/SASLogon/home` to the login page. `/SASLogon` seems to be stable enough across SAS versions
+  private redirectedLoginUrl = `/SASLogon/home`
  constructor(
    private serverUrl: string,
    private serverType: ServerType,
@@ -43,9 +42,6 @@ export class AuthManager {
    } = await this.fetchUserName()

    if (isLoggedInAlready) {
-      const logger = process.logger || console
-      logger.log('login was not attempted as a valid session already exists')
-
      await this.loginCallback()

      return {
@@ -113,9 +109,6 @@ export class AuthManager {
    } = await this.checkSession()

    if (isLoggedInAlready) {
-      const logger = process.logger || console
-      logger.log('login was not attempted as a valid session already exists')
-
      await this.loginCallback()

      this.userName = loginParams.username
@@ -138,10 +131,6 @@ export class AuthManager {
        loginResponse = await this.sendLoginRequest(newLoginForm, loginParams)
      }

-      // Sometimes due to redirection on SAS9 and SASViya we don't get the login response that says
-      // You have signed in. Therefore, we have to make an extra request for checking session to
-      // ensure either user is logged in or not.
-
      const res = await this.checkSession()
      isLoggedIn = res.isLoggedIn
      this.userLongName = res.userLongName
@@ -152,7 +141,7 @@ export class AuthManager {
        await this.performCASSecurityCheck()
      }

-      this.loginCallback()
+      await this.loginCallback()
      this.userName = loginParams.username
    }

@@ -166,12 +155,10 @@ export class AuthManager {
  private async performCASSecurityCheck() {
    const casAuthenticationUrl = `${this.serverUrl}/SASStoredProcess/j_spring_cas_security_check`

-    await this.requestClient
-      .get<string>(`/SASLogon/login?service=${casAuthenticationUrl}`, undefined)
-      .catch((err) => {
-        // ignore if resource not found error
-        if (!(err instanceof NotFoundError)) throw err
-      })
+    await this.requestClient.get<string>(
+      `/SASLogon/login?service=${casAuthenticationUrl}`,
+      undefined
+    )
  }

  private async sendLoginRequest(
@@ -252,7 +239,7 @@ export class AuthManager {
    }

    const { result: formResponse } = await this.requestClient.get<string>(
-      this.loginUrl.replace('/SASLogon/login.do', '/SASLogon/login'),
+      this.loginUrl.replace('.do', ''),
      undefined,
      'text/plain'
    )
@@ -325,13 +312,12 @@ export class AuthManager {
  }

  private getLoginForm(response: any) {
-    const pattern: RegExp = /<form.+action="(.*(Logon|login)[^"]*).*>/
+    const pattern: RegExp = /<form.+action="(.*Logon[^"]*).*>/
    const matches = pattern.exec(response)
    const formInputs: any = {}

    if (matches && matches.length) {
      this.setLoginUrl(matches)
-      response = response.replace(/<input/g, '\n<input')
      const inputs = response.match(/<input.*"hidden"[^>]*>/g)

      if (inputs) {
@@ -362,7 +348,7 @@ export class AuthManager {
      this.loginUrl =
        this.serverType === ServerType.SasViya
          ? tempLoginLink
-          : loginUrl.replace('/SASLogon/login.do', '/SASLogon/login')
+          : loginUrl.replace('.do', '')
    }
  }

--- a/src/auth/getTokens.ts
+++ b/src/auth/getTokens.ts
@@ -10,7 +10,6 @@ import { refreshTokensForSasjs } from './refreshTokensForSasjs'

 /**
 * Returns the auth configuration, refreshing the tokens if necessary.
- * This function can only be used by Node, if a server type is SASVIYA.
 * @param requestClient - the pre-configured HTTP request client
 * @param authConfig - an object containing a client ID, secret, access token and refresh token
 * @param serverType - server type for which refreshing the tokens, defaults to SASVIYA
@@ -30,12 +29,9 @@ export async function getTokens(
      const error =
        'Unable to obtain new access token. Your refresh token has expired.'
      logger.error(error)
-
      throw new Error(error)
    }
-
    logger.info('Refreshing access and refresh tokens.')
-
    const tokens =
      serverType === ServerType.SasViya
        ? await refreshTokensForViya(
--- a/src/auth/isLoginRequired.ts
+++ b/src/auth/isLoginRequired.ts
@@ -1,5 +1,5 @@
 export const isLogInRequired = (response: string): boolean => {
-  const pattern: RegExp = /<form.+action="(.*(Logon)|(login)[^"]*).*>/gm
+  const pattern: RegExp = /<form.+action="(.*Logon[^"]*).*>/gm
  const matches = pattern.test(response)
  return matches
 }
--- a/src/auth/refreshTokensForViya.ts
+++ b/src/auth/refreshTokensForViya.ts
@@ -2,11 +2,9 @@ import { SasAuthResponse } from '@sasjs/utils/types'
 import { prefixMessage } from '@sasjs/utils/error'
 import * as NodeFormData from 'form-data'
 import { RequestClient } from '../request/RequestClient'
-import { isNode } from '../utils'

 /**
 * Exchanges the refresh token for an access token for the given client.
- * This function can only be used by Node.
 * @param requestClient - the pre-configured HTTP request client
 * @param clientId - the client ID to authenticate with.
 * @param clientSecret - the client secret to authenticate with.
@@ -18,12 +16,9 @@ export async function refreshTokensForViya(
  clientSecret: string,
  refreshToken: string
 ) {
-  if (!isNode()) {
-    throw new Error(`Method 'refreshTokensForViya' can only be used by Node.`)
-  }
-
  const url = '/SASLogon/oauth/token'
-  const token =
+  let token
+  token =
    typeof Buffer === 'undefined'
      ? btoa(clientId + ':' + clientSecret)
      : Buffer.from(clientId + ':' + clientSecret).toString('base64')
@@ -32,7 +27,8 @@ export async function refreshTokensForViya(
    Authorization: 'Basic ' + token
  }

-  const formData = new NodeFormData()
+  const formData =
+    typeof FormData === 'undefined' ? new NodeFormData() : new FormData()
  formData.append('grant_type', 'refresh_token')
  formData.append('refresh_token', refreshToken)

--- a/src/auth/spec/AuthManager.spec.ts
+++ b/src/auth/spec/AuthManager.spec.ts
@@ -365,7 +365,7 @@ describe('AuthManager', () => {
      expect(loginResponse.userName).toEqual(userName)

      expect(openWebPageModule.openWebPage).toHaveBeenCalledWith(
-        `/SASLogon`,
+        `/SASLogon/home`,
        'SASLogon',
        {
          width: 500,
@@ -409,7 +409,7 @@ describe('AuthManager', () => {
      expect(loginResponse.userName).toEqual(userName)

      expect(openWebPageModule.openWebPage).toHaveBeenCalledWith(
-        `/SASLogon`,
+        `/SASLogon/home`,
        'SASLogon',
        {
          width: 500,
@@ -453,7 +453,7 @@ describe('AuthManager', () => {
      expect(loginResponse.userName).toEqual('')

      expect(openWebPageModule.openWebPage).toHaveBeenCalledWith(
-        `/SASLogon`,
+        `/SASLogon/home`,
        'SASLogon',
        {
          width: 500,
@@ -497,7 +497,7 @@ describe('AuthManager', () => {
      expect(loginResponse.userName).toEqual('')

      expect(openWebPageModule.openWebPage).toHaveBeenCalledWith(
-        `/SASLogon`,
+        `/SASLogon/home`,
        'SASLogon',
        {
          width: 500,
--- a/src/auth/spec/refreshTokensForViya.spec.ts
+++ b/src/auth/spec/refreshTokensForViya.spec.ts
@@ -3,7 +3,6 @@ import * as NodeFormData from 'form-data'
 import { generateToken, mockAuthResponse } from './mockResponses'
 import { RequestClient } from '../../request/RequestClient'
 import { refreshTokensForViya } from '../refreshTokensForViya'
-import * as IsNodeModule from '../../utils/isNode'

 const requestClient = new (<jest.Mock<RequestClient>>RequestClient)()

@@ -71,18 +70,6 @@ describe('refreshTokensForViya', () => {

    expect(error).toEqual(`Error while refreshing tokens: ${tokenError}`)
  })
-
-  it('should throw an error if environment is not Node', async () => {
-    jest.spyOn(IsNodeModule, 'isNode').mockImplementation(() => false)
-
-    const expectedError = new Error(
-      `Method 'refreshTokensForViya' can only be used by Node.`
-    )
-
-    expect(
-      refreshTokensForViya(requestClient, 'client', 'secret', 'token')
-    ).rejects.toEqual(expectedError)
-  })
 })

 const setupMocks = () => {
--- a/src/auth/spec/verifySas9Login.spec.ts
+++ b/src/auth/spec/verifySas9Login.spec.ts
@@ -17,7 +17,7 @@ describe('verifySas9Login', () => {
  it('should return isLoggedIn true by checking state of popup', async () => {
    const popup = {
      window: {
-        location: { href: serverUrl + `/SASLogon` },
+        location: { href: serverUrl + `/SASLogon/home` },
        document: { body: { innerText: '<h3>You have signed in.</h3>' } }
      }
    } as unknown as Window
--- a/src/auth/spec/verifySasViyaLogin.spec.ts
+++ b/src/auth/spec/verifySasViyaLogin.spec.ts
@@ -18,7 +18,7 @@ describe('verifySasViyaLogin', () => {
  it('should return isLoggedIn true by checking state of popup', async () => {
    const popup = {
      window: {
-        location: { href: serverUrl + `/SASLogon` },
+        location: { href: serverUrl + `/SASLogon/home` },
        document: { body: { innerText: '<h3>You have signed in.</h3>' } }
      }
    } as unknown as Window
--- a/src/job-execution/SasjsJobExecutor.ts
+++ b/src/job-execution/SasjsJobExecutor.ts
@@ -13,11 +13,7 @@ import { generateFileUploadForm } from '../file/generateFileUploadForm'

 import { RequestClient } from '../request/RequestClient'

-import {
-  isRelativePath,
-  appendExtraResponseAttributes,
-  getValidJson
-} from '../utils'
+import { isRelativePath, appendExtraResponseAttributes } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'

 export class SasjsJobExecutor extends BaseJobExecutor {
@@ -93,16 +89,12 @@ export class SasjsJobExecutor extends BaseJobExecutor {
            )
          }

-          const { result } = res.result
-          if (result && result.trim()) res.result = getValidJson(result)
-
          this.requestClient!.appendRequest(res, sasJob, config.debug)

          const responseObject = appendExtraResponseAttributes(
            res,
            extraResponseAttributes
          )
-
          resolve(responseObject)
        })
        .catch(async (e: Error) => {
--- a/src/job-execution/WebJobExecutor.ts
+++ b/src/job-execution/WebJobExecutor.ts
@@ -16,7 +16,8 @@ import { SASViyaApiClient } from '../SASViyaApiClient'
 import {
  isRelativePath,
  parseSasViyaDebugResponse,
-  appendExtraResponseAttributes
+  appendExtraResponseAttributes,
+  getValidJson
 } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
 import { parseWeboutResponse } from '../utils/parseWeboutResponse'
@@ -183,6 +184,10 @@ export class WebJobExecutor extends BaseJobExecutor {
            }
          }

+          if (typeof jsonResponse === 'string') {
+            jsonResponse = getValidJson(jsonResponse)
+          }
+
          const responseObject = appendExtraResponseAttributes(
            { result: jsonResponse, log: res.log },
            extraResponseAttributes
--- a/src/minified/sas9/SASjs.ts
+++ b/src/minified/sas9/SASjs.ts
@@ -1,273 +0,0 @@
-import { validateInput, compareTimestamps } from '../../utils'
-import { SASjsConfig, UploadFile, LoginMechanism } from '../../types'
-import { AuthManager } from '../../auth'
-import {
-  ServerType,
-  AuthConfig,
-  ExtraResponseAttributes
-} from '@sasjs/utils/types'
-import { RequestClient } from '../../request/RequestClient'
-import { FileUploader } from '../../job-execution/FileUploader'
-import { WebJobExecutor } from './WebJobExecutor'
-import { ErrorResponse } from '../../types/errors/ErrorResponse'
-import { LoginOptions, LoginResult } from '../../types/Login'
-
-const defaultConfig: SASjsConfig = {
-  serverUrl: '',
-  pathSASJS: '/SASjsApi/stp/execute',
-  pathSAS9: '/SASStoredProcess/do',
-  pathSASViya: '/SASJobExecution',
-  appLoc: '/Public/seedapp',
-  serverType: ServerType.Sas9,
-  debug: false,
-  contextName: 'SAS Job Execution compute context',
-  useComputeApi: null,
-  loginMechanism: LoginMechanism.Default
-}
-
-/**
- * SASjs is a JavaScript adapter for SAS.
- *
- */
-export default class SASjs {
-  private sasjsConfig: SASjsConfig = new SASjsConfig()
-  private jobsPath: string = ''
-  private fileUploader: FileUploader | null = null
-  private authManager: AuthManager | null = null
-  private requestClient: RequestClient | null = null
-  private webJobExecutor: WebJobExecutor | null = null
-
-  constructor(config?: Partial<SASjsConfig>) {
-    this.sasjsConfig = {
-      ...defaultConfig,
-      ...config
-    }
-
-    this.setupConfiguration()
-  }
-
-  /**
-   * Logs into the SAS server with the supplied credentials.
-   * @param username - a string representing the username.
-   * @param password - a string representing the password.
-   * @param clientId - a string representing the client ID.
-   */
-  public async logIn(
-    username?: string,
-    password?: string,
-    clientId?: string,
-    options: LoginOptions = {}
-  ): Promise<LoginResult> {
-    if (this.sasjsConfig.loginMechanism === LoginMechanism.Default) {
-      if (!username || !password)
-        throw new Error(
-          'A username and password are required when using the default login mechanism.'
-        )
-
-      return this.authManager!.logIn(username, password)
-    }
-
-    if (typeof window === typeof undefined) {
-      throw new Error(
-        'The redirected login mechanism is only available for use in the browser.'
-      )
-    }
-
-    return this.authManager!.redirectedLogIn(options)
-  }
-
-  /**
-   * Logs out of the configured SAS server.
-   */
-  public logOut() {
-    return this.authManager!.logOut()
-  }
-
-  /**
-   * Returns the current SASjs configuration.
-   *
-   */
-  public getSasjsConfig() {
-    return this.sasjsConfig
-  }
-
-  /**
-   * this method returns an array of SASjsRequest
-   * @returns SASjsRequest[]
-   */
-  public getSasRequests() {
-    const requests = [...this.requestClient!.getRequests()]
-    const sortedRequests = requests.sort(compareTimestamps)
-    return sortedRequests
-  }
-
-  /**
-   * Sets the debug state. Turning this on will enable additional logging in the adapter.
-   * @param value - boolean indicating debug state (on/off).
-   */
-  public setDebugState(value: boolean) {
-    this.sasjsConfig.debug = value
-  }
-
-  /**
-   * Uploads a file to the given service.
-   * @param sasJob - the path to the SAS program (ultimately resolves to
-   *  the SAS `_program` parameter to run a Job Definition or SAS 9 Stored
-   *  Process). Is prepended at runtime with the value of `appLoc`.
-   * @param files - array of files to be uploaded, including File object and file name.
-   * @param params - request URL parameters.
-   * @param config - provide any changes to the config here, for instance to
-   * enable/disable `debug`. Any change provided will override the global config,
-   * for that particular function call.
-   * @param loginRequiredCallback - a function that is called if the
-   * user is not logged in (eg to display a login form). The request will be
-   * resubmitted after successful login.
-   */
-  public async uploadFile(
-    sasJob: string,
-    files: UploadFile[],
-    params: { [key: string]: any } | null,
-    config: { [key: string]: any } = {},
-    loginRequiredCallback?: () => any
-  ) {
-    config = {
-      ...this.sasjsConfig,
-      ...config
-    }
-    const data = { files, params }
-
-    return await this.fileUploader!.execute(
-      sasJob,
-      data,
-      config,
-      loginRequiredCallback
-    )
-  }
-
-  /**
-   * Makes a request to program specified in `SASjob` (could be a Viya Job, a
-   * SAS 9 Stored Process, or a SASjs Server Stored Program). The response
-   * object will always contain table names in lowercase, and column names in
-   * uppercase. Values are returned formatted by default, unformatted
-   * values can be configured as an option in the `%webout` macro.
-   *
-   * @param sasJob - the path to the SAS program (ultimately resolves to
-   *  the SAS `_program` parameter to run a Job Definition or SAS 9 Stored
-   *  Process). Is prepended at runtime with the value of `appLoc`.
-   * @param data - a JSON object containing one or more tables to be sent to
-   * SAS.  For an example of the table structure, see the project README. This
-   * value can be `null` if no inputs are required.
-   * @param config - provide any changes to the config here, for instance to
-   * enable/disable `debug`. Any change provided will override the global config,
-   * for that particular function call.
-   * @param loginRequiredCallback - a function that is called if the
-   * user is not logged in (eg to display a login form). The request will be
-   * resubmitted after successful login.
-   * When using a `loginRequiredCallback`, the call to the request will look, for example, like so:
-   * `await request(sasJobPath, data, config, () => setIsLoggedIn(false))`
-   * If you are not passing in any data and configuration, it will look like so:
-   * `await request(sasJobPath, {}, {}, () => setIsLoggedIn(false))`
-   * @param extraResponseAttributes - a array of predefined values that are used
-   * to provide extra attributes (same names as those values) to be added in response
-   * Supported values are declared in ExtraResponseAttributes type.
-   */
-  public async request(
-    sasJob: string,
-    data: { [key: string]: any } | null,
-    config: { [key: string]: any } = {},
-    loginRequiredCallback?: () => any,
-    authConfig?: AuthConfig,
-    extraResponseAttributes: ExtraResponseAttributes[] = []
-  ) {
-    config = {
-      ...this.sasjsConfig,
-      ...config
-    }
-
-    const validationResult = validateInput(data)
-
-    // status is true if the data passes validation checks above
-    if (validationResult.status) {
-      return await this.webJobExecutor!.execute(
-        sasJob,
-        data,
-        config,
-        loginRequiredCallback,
-        authConfig,
-        extraResponseAttributes
-      )
-    } else {
-      return Promise.reject(new ErrorResponse(validationResult.msg))
-    }
-  }
-
-  /**
-   * Checks whether a session is active, or login is required.
-   * @returns - a promise which resolves with an object containing two values - a boolean `isLoggedIn`, and a string `userName`.
-   */
-  public async checkSession() {
-    return this.authManager!.checkSession()
-  }
-
-  private setupConfiguration() {
-    if (
-      this.sasjsConfig.serverUrl === undefined ||
-      this.sasjsConfig.serverUrl === ''
-    ) {
-      if (typeof location !== 'undefined') {
-        let url = `${location.protocol}//${location.hostname}`
-
-        if (location.port) url = `${url}:${location.port}`
-
-        this.sasjsConfig.serverUrl = url
-      } else {
-        this.sasjsConfig.serverUrl = ''
-      }
-    }
-
-    if (this.sasjsConfig.serverUrl.slice(-1) === '/') {
-      this.sasjsConfig.serverUrl = this.sasjsConfig.serverUrl.slice(0, -1)
-    }
-
-    if (!this.requestClient) {
-      this.requestClient = new RequestClient(
-        this.sasjsConfig.serverUrl,
-        this.sasjsConfig.httpsAgentOptions,
-        this.sasjsConfig.requestHistoryLimit
-      )
-    } else {
-      this.requestClient.setConfig(
-        this.sasjsConfig.serverUrl,
-        this.sasjsConfig.httpsAgentOptions
-      )
-    }
-
-    this.jobsPath = this.sasjsConfig.pathSAS9
-
-    this.authManager = new AuthManager(
-      this.sasjsConfig.serverUrl,
-      this.sasjsConfig.serverType!,
-      this.requestClient,
-      this.resendWaitingRequests
-    )
-
-    this.fileUploader = new FileUploader(
-      this.sasjsConfig.serverUrl,
-      this.sasjsConfig.serverType!,
-      this.jobsPath,
-      this.requestClient
-    )
-
-    this.webJobExecutor = new WebJobExecutor(
-      this.sasjsConfig.serverUrl,
-      this.sasjsConfig.serverType!,
-      this.jobsPath,
-      this.requestClient
-    )
-  }
-
-  private resendWaitingRequests = async () => {
-    await this.webJobExecutor?.resendWaitingRequests()
-    await this.fileUploader?.resendWaitingRequests()
-  }
-}
--- a/src/minified/sas9/WebJobExecutor.ts
+++ b/src/minified/sas9/WebJobExecutor.ts
@@ -1,157 +0,0 @@
-import {
-  AuthConfig,
-  ExtraResponseAttributes,
-  ServerType
-} from '@sasjs/utils/types'
-import {
-  ErrorResponse,
-  JobExecutionError,
-  LoginRequiredError
-} from '../../types/errors'
-import { RequestClient } from '../../request/RequestClient'
-import {
-  isRelativePath,
-  parseSasViyaDebugResponse,
-  appendExtraResponseAttributes,
-  convertToCSV
-} from '../../utils'
-import { BaseJobExecutor } from '../../job-execution/JobExecutor'
-import { parseWeboutResponse } from '../../utils/parseWeboutResponse'
-
-export interface WaitingRequstPromise {
-  promise: Promise<any> | null
-  resolve: any
-  reject: any
-}
-export class WebJobExecutor extends BaseJobExecutor {
-  constructor(
-    serverUrl: string,
-    serverType: ServerType,
-    private jobsPath: string,
-    private requestClient: RequestClient
-  ) {
-    super(serverUrl, serverType)
-  }
-
-  async execute(
-    sasJob: string,
-    data: any,
-    config: any,
-    loginRequiredCallback?: any,
-    authConfig?: AuthConfig,
-    extraResponseAttributes: ExtraResponseAttributes[] = []
-  ) {
-    const loginCallback = loginRequiredCallback
-    const program = isRelativePath(sasJob)
-      ? config.appLoc
-        ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
-        : sasJob
-      : sasJob
-    let apiUrl = `${config.serverUrl}${this.jobsPath}/?${'_program=' + program}`
-
-    let requestParams = {
-      ...this.getRequestParams(config)
-    }
-
-    let formData = new FormData()
-
-    if (data) {
-      try {
-        formData = generateFileUploadForm(formData, data)
-      } catch (e: any) {
-        return Promise.reject(new ErrorResponse(e?.message, e))
-      }
-    }
-
-    for (const key in requestParams) {
-      if (requestParams.hasOwnProperty(key)) {
-        formData.append(key, requestParams[key])
-      }
-    }
-
-    const requestPromise = new Promise((resolve, reject) => {
-      this.requestClient!.post(apiUrl, formData, authConfig?.access_token)
-        .then(async (res: any) => {
-          this.requestClient!.appendRequest(res, sasJob, config.debug)
-
-          const jsonResponse =
-            config.debug && typeof res.result === 'string'
-              ? parseWeboutResponse(res.result, apiUrl)
-              : res.result
-
-          const responseObject = appendExtraResponseAttributes(
-            { result: jsonResponse, log: res.log },
-            extraResponseAttributes
-          )
-          resolve(responseObject)
-        })
-        .catch(async (e: Error) => {
-          if (e instanceof JobExecutionError) {
-            this.requestClient!.appendRequest(e, sasJob, config.debug)
-            reject(new ErrorResponse(e?.message, e))
-          }
-
-          if (e instanceof LoginRequiredError) {
-            if (!loginRequiredCallback) {
-              reject(
-                new ErrorResponse(
-                  'Request is not authenticated. Make sure .env file exists with valid credentials.',
-                  e
-                )
-              )
-            }
-
-            this.appendWaitingRequest(() => {
-              return this.execute(
-                sasJob,
-                data,
-                config,
-                loginRequiredCallback,
-                authConfig,
-                extraResponseAttributes
-              ).then(
-                (res: any) => {
-                  resolve(res)
-                },
-                (err: any) => {
-                  reject(err)
-                }
-              )
-            })
-
-            if (loginCallback) await loginCallback()
-          } else reject(new ErrorResponse(e?.message, e))
-        })
-    })
-
-    return requestPromise
-  }
-}
-
-/**
- * One of the approaches SASjs takes to send tables-formatted JSON (see README)
- * to SAS is as multipart form data, where each table is provided as a specially
- * formatted CSV file.
- */
-const generateFileUploadForm = (formData: FormData, 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.'
-      )
-    }
-
-    const file = new Blob([csv], {
-      type: 'application/csv'
-    })
-
-    formData.append(name, file, `${name}.csv`)
-  }
-
-  return formData
-}
--- a/src/minified/sas9/index.ts
+++ b/src/minified/sas9/index.ts
@@ -1,3 +0,0 @@
-import SASjs from './SASjs'
-export * from '../../types'
-export default SASjs
--- a/src/request/Sas9RequestClient.ts
+++ b/src/request/Sas9RequestClient.ts
@@ -4,7 +4,6 @@ import axiosCookieJarSupport from 'axios-cookiejar-support'
 import * as tough from 'tough-cookie'
 import { prefixMessage } from '@sasjs/utils/error'
 import { RequestClient, throwIfError } from './RequestClient'
-import { JobExecutionError } from '../types/errors'

 /**
 * Specific request client for SAS9 in Node.js environments.
@@ -70,8 +69,6 @@ export class Sas9RequestClient extends RequestClient {
        return this.parseResponse<T>(response)
      })
      .catch(async (e: any) => {
-        if (e instanceof JobExecutionError) throw e
-
        return await this.handleError(
          e,
          () =>
--- a/src/request/SasjsRequestClient.ts
+++ b/src/request/SasjsRequestClient.ts
@@ -1,14 +1,6 @@
 import { RequestClient } from './RequestClient'
 import { AxiosResponse } from 'axios'
-import { SASJS_LOGS_SEPARATOR } from '../utils'
-
-interface SasjsParsedResponse<T> {
-  result: T
-  log: string
-  etag: string
-  status: number
-  printOutput?: string
-}
+import { SASJS_LOGS_SEPARATOR, getValidJson } from '../utils'

 /**
 * Specific request client for SASJS.
@@ -35,7 +27,7 @@ export class SasjsRequestClient extends RequestClient {
  protected parseResponse<T>(response: AxiosResponse<any>) {
    const etag = response?.headers ? response.headers['etag'] : ''
    let parsedResponse = {}
-    let webout, log, printOutput
+    let log

    try {
      if (typeof response.data === 'string') {
@@ -46,26 +38,17 @@ export class SasjsRequestClient extends RequestClient {
    } catch {
      if (response.data.includes(SASJS_LOGS_SEPARATOR)) {
        const splittedResponse = response.data.split(SASJS_LOGS_SEPARATOR)
-
-        webout = splittedResponse[0]
-        if (webout) parsedResponse = webout
-
        log = splittedResponse[1]
-        printOutput = splittedResponse[2]
-      } else {
-        parsedResponse = response.data
-      }
+        if (splittedResponse[0].trim())
+          parsedResponse = getValidJson(splittedResponse[0])
+      } else parsedResponse = response.data
    }

-    const returnResult: SasjsParsedResponse<T> = {
+    return {
      result: parsedResponse as T,
      log,
      etag,
      status: response.status
    }
-
-    if (printOutput) returnResult.printOutput = printOutput
-
-    return returnResult
  }
 }
--- a/src/test/SessionManager.spec.ts
+++ b/src/test/SessionManager.spec.ts
@@ -3,11 +3,10 @@ import { RequestClient } from '../request/RequestClient'
 import * as dotenv from 'dotenv'
 import axios from 'axios'
 import { Logger, LogLevel } from '@sasjs/utils'
-import { Session, Context } from '../types'
+import { Session } from '../types'

 jest.mock('axios')
 const mockedAxios = axios as jest.Mocked<typeof axios>
-const requestClient = new (<jest.Mock<RequestClient>>RequestClient)()

 describe('SessionManager', () => {
  dotenv.config()
@@ -15,23 +14,9 @@ describe('SessionManager', () => {
  const sessionManager = new SessionManager(
    process.env.SERVER_URL as string,
    process.env.DEFAULT_COMPUTE_CONTEXT as string,
-    requestClient
+    new RequestClient('https://sample.server.com')
  )

-  const getMockSession = () => ({
-    id: ['id', new Date().getTime(), Math.random()].join('-'),
-    state: '',
-    links: [{ rel: 'state', href: '', uri: '', type: '', method: 'GET' }],
-    attributes: {
-      sessionInactiveTimeout: 900
-    },
-    creationTimeStamp: `${new Date(new Date().getTime()).toISOString()}`
-  })
-
-  afterEach(() => {
-    jest.restoreAllMocks()
-  })
-
  describe('getVariable', () => {
    it('should fetch session variable', async () => {
      const sampleResponse = {
@@ -60,30 +45,6 @@ describe('SessionManager', () => {
        )
      ).resolves.toEqual(expectedResponse)
    })
-
-    it('should throw an error if GET request failed', async () => {
-      const responseStatus = 500
-      const responseErrorMessage = `The process timed out after 60 seconds. Request failed with status code ${responseStatus}`
-      const response = {
-        status: responseStatus,
-        data: {
-          message: responseErrorMessage
-        }
-      }
-      const testVariable = 'testVariable'
-
-      jest.spyOn(requestClient, 'get').mockImplementation(() =>
-        Promise.reject({
-          response
-        })
-      )
-
-      const expectedError = `Error while fetching session variable '${testVariable}'. GET request to ${process.env.SERVER_URL}/compute/sessions/testId/variables/${testVariable} failed with status code ${responseStatus}. ${responseErrorMessage}`
-
-      await expect(
-        sessionManager.getVariable('testId', testVariable)
-      ).rejects.toEqual(expectedError)
-    })
  })

  describe('waitForSession', () => {
@@ -154,25 +115,11 @@ describe('SessionManager', () => {
    })

    it('should throw an error if could not get session state', async () => {
-      const gettingSessionStatus = 500
-      const sessionStatusError = `Getting session status timed out after 60 seconds. Request failed with status code ${gettingSessionStatus}`
-
-      mockedAxios.get.mockImplementation(() =>
-        Promise.reject({
-          response: {
-            status: gettingSessionStatus,
-            data: {
-              message: sessionStatusError
-            }
-          }
-        })
-      )
-
-      const expectedError = `Error while waiting for session. Error while getting session state. GET request to ${process.env.SERVER_URL}?wait=30 failed with status code ${gettingSessionStatus}. ${sessionStatusError}`
+      mockedAxios.get.mockImplementation(() => Promise.reject('Mocked error'))

      await expect(
        sessionManager['waitForSession'](session, null, 'access_token')
-      ).rejects.toEqual(expectedError)
+      ).rejects.toContain('Error while getting session state.')
    })

    it('should return session state', async () => {
@@ -188,243 +135,4 @@ describe('SessionManager', () => {
      ).resolves.toEqual(customSession.state)
    })
  })
-
-  describe('isSessionValid', () => {
-    const session: Session = getMockSession()
-
-    it('should return false if not a session provided', () => {
-      expect(sessionManager['isSessionValid'](undefined as any)).toEqual(false)
-    })
-
-    it('should return true if session is not expired', () => {
-      expect(sessionManager['isSessionValid'](session)).toEqual(true)
-    })
-
-    it('should return false if session is expired', () => {
-      session.creationTimeStamp = `${new Date(
-        new Date().getTime() -
-          (session.attributes.sessionInactiveTimeout * 1000 + 1000)
-      ).toISOString()}`
-      expect(sessionManager['isSessionValid'](session)).toEqual(false)
-    })
-  })
-
-  describe('removeSessionFromPool', () => {
-    it('should remove session from the pool of sessions', () => {
-      const session: Session = getMockSession()
-      const sessions: Session[] = [getMockSession(), session]
-
-      sessionManager['sessions'] = sessions
-      sessionManager['removeSessionFromPool'](session)
-
-      expect(sessionManager['sessions'].length).toEqual(1)
-    })
-  })
-
-  describe('getSession', () => {
-    it('should return session if there is a valid session and create new session', async () => {
-      jest
-        .spyOn(sessionManager as any, 'createAndWaitForSession')
-        .mockImplementation(async () => Promise.resolve(getMockSession()))
-
-      const session = getMockSession()
-      sessionManager['sessions'] = [session]
-
-      await expect(sessionManager.getSession()).resolves.toEqual(session)
-      expect(sessionManager['createAndWaitForSession']).toHaveBeenCalled()
-    })
-
-    it('should return a session and keep one session if there is no sessions available', async () => {
-      jest
-        .spyOn(sessionManager as any, 'createAndWaitForSession')
-        .mockImplementation(async () => {
-          const session = getMockSession()
-          sessionManager['sessions'].push(session)
-
-          return Promise.resolve(session)
-        })
-
-      const session = await sessionManager.getSession()
-
-      expect(Object.keys(session)).toEqual(Object.keys(getMockSession()))
-      expect(sessionManager['createAndWaitForSession']).toHaveBeenCalledTimes(2)
-      expect(sessionManager['sessions'].length).toEqual(1)
-    })
-
-    it.concurrent(
-      'should throw an error if session creation request returned 500',
-      async () => {
-        const sessionCreationStatus = 500
-        const sessionCreationError = `The process initialization for the Compute server with the ID 'ed40398a-ec8a-422b-867a-61493ee8a57f' timed out after 60 seconds. Request failed with status code ${sessionCreationStatus}`
-
-        jest.spyOn(requestClient, 'post').mockImplementation(() =>
-          Promise.reject({
-            response: {
-              status: sessionCreationStatus,
-              data: {
-                message: sessionCreationError
-              }
-            }
-          })
-        )
-
-        const contextId = 'testContextId'
-        const context: Context = {
-          name: 'testContext',
-          id: contextId,
-          createdBy: 'createdBy',
-          version: 1
-        }
-
-        sessionManager['currentContext'] = context
-
-        const expectedError = new Error(
-          `Error while creating session. POST request to ${process.env.SERVER_URL}/compute/contexts/${contextId}/sessions failed with status code ${sessionCreationStatus}. ${sessionCreationError}`
-        )
-
-        await expect(sessionManager.getSession()).rejects.toEqual(expectedError)
-      }
-    )
-  })
-
-  describe('clearSession', () => {
-    it('should clear session', async () => {
-      jest
-        .spyOn(requestClient, 'delete')
-        .mockImplementation(() =>
-          Promise.resolve({ result: '', etag: '', status: 200 })
-        )
-
-      const sessionToBeCleared = getMockSession()
-      const sessionToStay = getMockSession()
-
-      sessionManager['sessions'] = [sessionToBeCleared, sessionToStay]
-
-      await sessionManager.clearSession(sessionToBeCleared.id)
-
-      expect(sessionManager['sessions']).toEqual([sessionToStay])
-    })
-
-    it('should throw error if DELETE request failed', async () => {
-      const sessionCreationStatus = 500
-      const sessionDeleteError = `The process timed out after 60 seconds. Request failed with status code ${sessionCreationStatus}`
-
-      jest.spyOn(requestClient, 'delete').mockImplementation(() =>
-        Promise.reject({
-          response: {
-            status: sessionCreationStatus,
-            data: {
-              message: sessionDeleteError
-            }
-          }
-        })
-      )
-
-      const session = getMockSession()
-
-      sessionManager['sessions'] = [session]
-
-      const expectedError = `Error while deleting session. DELETE request to /compute/sessions/${session.id} failed with status code ${sessionCreationStatus}. ${sessionDeleteError}`
-
-      await expect(sessionManager.clearSession(session.id)).rejects.toEqual(
-        expectedError
-      )
-    })
-  })
-
-  describe('waitForCurrentContext', () => {
-    it('should resolve when current context is ready', async () => {
-      sessionManager['settingContext'] = true
-      sessionManager['contextName'] = 'test context'
-
-      await expect(sessionManager['waitForCurrentContext']()).toResolve()
-      expect(sessionManager['settingContext']).toEqual(false)
-    })
-  })
-
-  describe('setCurrentContext', () => {
-    it('should set current context', async () => {
-      const contextName = 'test context'
-      const testContext: Context = {
-        name: contextName,
-        id: 'string',
-        createdBy: 'string',
-        version: 1
-      }
-
-      jest.spyOn(requestClient, 'get').mockImplementation(() => {
-        return Promise.resolve({
-          result: {
-            items: [testContext]
-          },
-          etag: '',
-          status: 200
-        })
-      })
-
-      sessionManager['currentContext'] = null
-      sessionManager['contextName'] = contextName
-      sessionManager['settingContext'] = false
-
-      await expect(sessionManager['setCurrentContext']()).toResolve()
-      expect(sessionManager['currentContext']).toEqual(testContext)
-    })
-
-    it('should throw error if GET request failed', async () => {
-      const responseStatus = 500
-      const responseErrorMessage = `The process timed out after 60 seconds. Request failed with status code ${responseStatus}`
-      const response = {
-        status: responseStatus,
-        data: {
-          message: responseErrorMessage
-        }
-      }
-
-      jest.spyOn(requestClient, 'get').mockImplementation(() =>
-        Promise.reject({
-          response
-        })
-      )
-
-      const expectedError = `Error while getting list of contexts. GET request to ${process.env.SERVER_URL}/compute/contexts?limit=10000 failed with status code ${responseStatus}. ${responseErrorMessage}`
-
-      sessionManager['currentContext'] = null
-
-      await expect(sessionManager['setCurrentContext']()).rejects.toEqual(
-        expectedError
-      )
-    })
-
-    it('should throw an error if current context is not in the list of contexts', async () => {
-      const contextName = 'test context'
-      const testContext: Context = {
-        name: `${contextName} does not exist`,
-        id: 'string',
-        createdBy: 'string',
-        version: 1
-      }
-
-      jest.spyOn(requestClient, 'get').mockImplementation(() => {
-        return Promise.resolve({
-          result: {
-            items: [testContext]
-          },
-          etag: '',
-          status: 200
-        })
-      })
-
-      sessionManager['currentContext'] = null
-      sessionManager['contextName'] = contextName
-      sessionManager['settingContext'] = false
-
-      const expectedError = new Error(
-        `The context '${contextName}' was not found on the server ${process.env.SERVER_URL}.`
-      )
-
-      await expect(sessionManager['setCurrentContext']()).rejects.toEqual(
-        expectedError
-      )
-    })
-  })
 })
--- a/src/types/errors/ErrorResponse.ts
+++ b/src/types/errors/ErrorResponse.ts
@@ -21,8 +21,8 @@ export class ErrorResponse {
  }
 }

-export interface ErrorBody {
+interface ErrorBody {
  message: string
-  details: any
+  details: string
  raw: any
 }
--- a/src/utils/getValidJson.ts
+++ b/src/utils/getValidJson.ts
@@ -17,7 +17,6 @@ export const getValidJson = (str: string | object): object => {
    return JSON.parse(str)
  } catch (e: any) {
    if (e instanceof JsonParseArrayError) throw e
-
    throw new InvalidJsonError()
  }
 }
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -23,16 +23,8 @@ const optimization = {
 }

 const browserConfig = {
-  entry: {
-    index: './src/index.ts',
-    minified_sas9: './src/minified/sas9/index.ts'
-  },
-  output: {
-    filename: '[name].js',
-    path: path.resolve(__dirname, 'build'),
-    libraryTarget: 'umd',
-    library: 'SASjs'
-  },
+  entry: './src/index.ts',
+  devtool: 'inline-source-map',
  mode: 'production',
  optimization: optimization,
  module: {
@@ -48,6 +40,12 @@ const browserConfig = {
    extensions: ['.ts', '.js'],
    fallback: { https: false, fs: false, readline: false }
  },
+  output: {
+    filename: 'index.js',
+    path: path.resolve(__dirname, 'build'),
+    libraryTarget: 'umd',
+    library: 'SASjs'
+  },
  plugins: [
    ...defaultPlugins,
    new webpack.ProvidePlugin({
@@ -57,18 +55,6 @@ const browserConfig = {
  ]
 }

-const browserConfigWithDevTool = {
-  ...browserConfig,
-  entry: './src/index.ts',
-  output: {
-    filename: 'index-dev.js',
-    path: path.resolve(__dirname, 'build'),
-    libraryTarget: 'umd',
-    library: 'SASjs'
-  },
-  devtool: 'inline-source-map'
-}
-
 const browserConfigWithoutProcessPlugin = {
  entry: browserConfig.entry,
  devtool: browserConfig.devtool,
@@ -86,9 +72,8 @@ const nodeConfig = {
  entry: './node/index.ts',
  output: {
    ...browserConfig.output,
-    path: path.resolve(__dirname, 'build', 'node'),
-    filename: 'index.js'
+    path: path.resolve(__dirname, 'build', 'node')
  }
 }

-module.exports = [browserConfig, browserConfigWithDevTool, nodeConfig]
+module.exports = [browserConfig, nodeConfig]