Merge pull request #56 from sasjs/performance-improvements

fix(*): Performance improvements
chore(ci): add lint action
2026-01-03 10:40:06 +00:00 · 2020-09-01 11:49:34 +01:00 · 2020-09-01 11:20:46 +01:00 · 2020-09-01 11:13:52 +01:00 · 2020-09-01 11:12:56 +01:00 · 2020-08-31 10:23:01 +01:00
108 changed files with 17061 additions and 2545 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,11 @@ jobs:
        uses: actions/setup-node@v1
        with:
          node-version: ${{ matrix.node-version }}
-      - run: npm ci
-      - run: npm run package:lib
+      - name: Install Dependencies
+        run: npm ci
+      - name: Check code style
+        run: npm run lint
+      - name: Build Package
+        run: npm run package:lib
        env:
          CI: true
--- a/.github/workflows/npmpublish.yml
+++ b/.github/workflows/npmpublish.yml
@@ -16,6 +16,8 @@ jobs:
        uses: actions/checkout@v2
      - name: Install Dependencies
        run: npm ci
+      - name: Check code style
+        run: npm run lint
      - name: Build Project
        run: npm run build
      - name: Semantic Release
--- a/.prettierrc
+++ b/.prettierrc
@@ -0,0 +1,6 @@
+{
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": false
+}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -70,6 +70,14 @@ parmcards4;
  %webout(CLOSE)
 ;;;;
 %mp_createwebservice(path=/Public/app/common,name=sendArr)
+filename ft15f001 temp;
+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; 
+;;;;
+%mp_createwebservice(path=/Public/app/common,name=makeErr)
 ```

 The above services will return anything you send. To run the tests simply launch `npm run cypress`.
--- a/README.md
+++ b/README.md
@@ -10,13 +10,13 @@ SASjs is a open-source framework for building Web Apps on SAS® platforms. You c

 3 - Reference directly from the CDN - in which case click [here](https://www.jsdelivr.com/package/npm/@sasjs/adapter?tab=collection) and select "SRI" to get the script tag with the integrity hash.

-If you are short on time and just need to build an app quickly, then check out [this video](https://vimeo.com/393161794) and the [react-seed-app](https://github.com/macropeople/react-seed-app) which provides some boilerplate.
+If you are short on time and just need to build an app quickly, then check out [this video](https://vimeo.com/393161794) and the [react-seed-app](https://github.com/sasjs/react-seed-app) which provides some boilerplate.

 For more information on building web apps with SAS, check out [sasjs.io](https://sasjs.io)

 ## None of this makes sense. How do I build an app with it?

-Ok ok. Deploy this [example.html](https://github.com/sasjs/adapter/blob/main/example.html) file to your web server, and update `servertype` to `SAS9` or `SASVIYA` depending on your backend.
+Ok ok. Deploy this [example.html](https://raw.githubusercontent.com/sasjs/adapter/master/example.html) file to your web server, and update `servertype` to `SAS9` or `SASVIYA` depending on your backend.

 The backend part can be deployed as follows:

@@ -43,6 +43,6 @@ You now have a simple web app with a backend service!

 # More resources

-For more information specific to this adapter you can check out this [user guide](https://sasjs.io/sasjs/sasjs-adapter/) or the [technical](http://adapter.sasjs.io/) documentation.
+For more information specific to this adapter you can check out this [user guide](https://sasjs.io/sasjs-adapter/) or the [technical](http://adapter.sasjs.io/) documentation.

 For more information on building web apps in general, check out these [resources](https://sasjs.io/training/resources/) or contact the [author](https://www.linkedin.com/in/allanbowe/) directly.
--- a/docs/assets/js/search.json
+++ b/docs/assets/js/search.json
--- a/docs/classes/reflection-560.reflection-1.sas9apiclient.html
+++ b/docs/classes/reflection-560.reflection-1.sas9apiclient.html
--- a/docs/classes/reflection-560.reflection-1.sasjs.html
+++ b/docs/classes/reflection-560.reflection-1.sasjs.html
--- a/docs/classes/reflection-560.reflection-1.sasviyaapiclient.html
+++ b/docs/classes/reflection-560.reflection-1.sasviyaapiclient.html
--- a/docs/classes/reflection-560.reflection-1.sessionmanager.html
+++ b/docs/classes/reflection-560.reflection-1.sessionmanager.html
--- a/docs/classes/reflection-588.reflection-1.sas9apiclient.html
+++ b/docs/classes/reflection-588.reflection-1.sas9apiclient.html
--- a/docs/classes/reflection-588.reflection-1.sasjs.html
+++ b/docs/classes/reflection-588.reflection-1.sasjs.html
--- a/docs/classes/reflection-588.reflection-1.sasviyaapiclient.html
+++ b/docs/classes/reflection-588.reflection-1.sasviyaapiclient.html
--- a/docs/classes/reflection-588.reflection-1.sessionmanager.html
+++ b/docs/classes/reflection-588.reflection-1.sessionmanager.html
--- a/docs/classes/reflection-607.reflection-145.fileuploader.html
+++ b/docs/classes/reflection-607.reflection-145.fileuploader.html
--- a/docs/classes/reflection-607.reflection-145.sas9apiclient.html
+++ b/docs/classes/reflection-607.reflection-145.sas9apiclient.html
--- a/docs/classes/reflection-607.reflection-145.sasjs.html
+++ b/docs/classes/reflection-607.reflection-145.sasjs.html
--- a/docs/classes/reflection-607.reflection-145.sasviyaapiclient.html
+++ b/docs/classes/reflection-607.reflection-145.sasviyaapiclient.html
--- a/docs/classes/reflection-607.reflection-145.sessionmanager.html
+++ b/docs/classes/reflection-607.reflection-145.sessionmanager.html
--- a/docs/classes/reflection-610.reflection-149.fileuploader.html
+++ b/docs/classes/reflection-610.reflection-149.fileuploader.html
--- a/docs/classes/reflection-610.reflection-149.sas9apiclient.html
+++ b/docs/classes/reflection-610.reflection-149.sas9apiclient.html
--- a/docs/classes/reflection-610.reflection-149.sasjs.html
+++ b/docs/classes/reflection-610.reflection-149.sasjs.html
--- a/docs/classes/reflection-610.reflection-149.sasviyaapiclient.html
+++ b/docs/classes/reflection-610.reflection-149.sasviyaapiclient.html
--- a/docs/classes/reflection-610.reflection-149.sessionmanager.html
+++ b/docs/classes/reflection-610.reflection-149.sessionmanager.html
--- a/docs/classes/reflection-611.reflection-149.fileuploader.html
+++ b/docs/classes/reflection-611.reflection-149.fileuploader.html
--- a/docs/classes/reflection-611.reflection-149.sas9apiclient.html
+++ b/docs/classes/reflection-611.reflection-149.sas9apiclient.html
--- a/docs/classes/reflection-611.reflection-149.sasjs.html
+++ b/docs/classes/reflection-611.reflection-149.sasjs.html
--- a/docs/classes/reflection-611.reflection-149.sasviyaapiclient.html
+++ b/docs/classes/reflection-611.reflection-149.sasviyaapiclient.html
--- a/docs/classes/reflection-611.reflection-149.sessionmanager.html
+++ b/docs/classes/reflection-611.reflection-149.sessionmanager.html
--- a/docs/classes/types.sasjsconfig.html
+++ b/docs/classes/types.sasjsconfig.html
--- a/docs/enums/types.servertype.html
+++ b/docs/enums/types.servertype.html
--- a/docs/globals.html
+++ b/docs/globals.html
--- a/docs/index.html
+++ b/docs/index.html
--- a/docs/interfaces/types.context.html
+++ b/docs/interfaces/types.context.html
--- a/docs/interfaces/types.csrftoken.html
+++ b/docs/interfaces/types.csrftoken.html
--- a/docs/interfaces/types.folder.html
+++ b/docs/interfaces/types.folder.html
--- a/docs/interfaces/types.job.html
+++ b/docs/interfaces/types.job.html
--- a/docs/interfaces/types.jobdefinition.html
+++ b/docs/interfaces/types.jobdefinition.html
--- a/docs/interfaces/types.jobresult.html
+++ b/docs/interfaces/types.jobresult.html
--- a/docs/interfaces/types.link.html
+++ b/docs/interfaces/types.link.html
--- a/docs/interfaces/types.sasjsrequest.html
+++ b/docs/interfaces/types.sasjsrequest.html
--- a/docs/interfaces/types.sasjswaitingrequest.html
+++ b/docs/interfaces/types.sasjswaitingrequest.html
--- a/docs/interfaces/types.session.html
+++ b/docs/interfaces/types.session.html
--- a/docs/interfaces/types.uploadfile.html
+++ b/docs/interfaces/types.uploadfile.html
--- a/docs/modules/reflection-560.html
+++ b/docs/modules/reflection-560.html
--- a/docs/modules/reflection-560.reflection-1.html
+++ b/docs/modules/reflection-560.reflection-1.html
--- a/docs/modules/reflection-588.html
+++ b/docs/modules/reflection-588.html
--- a/docs/modules/reflection-588.reflection-1.html
+++ b/docs/modules/reflection-588.reflection-1.html
--- a/docs/modules/reflection-607.html
+++ b/docs/modules/reflection-607.html
--- a/docs/modules/reflection-607.reflection-145.html
+++ b/docs/modules/reflection-607.reflection-145.html
--- a/docs/modules/reflection-610.html
+++ b/docs/modules/reflection-610.html
--- a/docs/modules/reflection-610.reflection-149.html
+++ b/docs/modules/reflection-610.reflection-149.html
--- a/docs/modules/reflection-611.html
+++ b/docs/modules/reflection-611.html
--- a/docs/modules/reflection-611.reflection-149.html
+++ b/docs/modules/reflection-611.reflection-149.html
--- a/docs/modules/types.html
+++ b/docs/modules/types.html
--- a/docs/modules/utils.html
+++ b/docs/modules/utils.html
--- a/example.html
+++ b/example.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
  <head>
-    <meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=edge" />
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
    <script src="https://cdn.jsdelivr.net/combine/npm/chart.js@2.9.3,npm/jquery@3.5.1,npm/@sasjs/adapter@1"></script> 
    <script>
-      var sasJs = new SASjs.default({appLoc: "/Products/demo/readme"
-        ,serverType:"SAS9", debug: "false"
+      var sasJs = new SASjs.default({
+         appLoc: "/Public/app/readme"
+        ,serverType:"SAS9"
+        ,debug: false
      });
      function initSasJs() {
        $('#loading-spinner').show()
@@ -70,6 +70,8 @@
        });
      }
    </script>
+    <meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=edge" />
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
  </head>
  <body>
    <div class="container-fluid" style="text-align: center; margin-top: 10px;">
@@ -104,4 +106,4 @@
      <canvas id="myChart" style="display: none;"></canvas>
    </div>
  </body>
-</head>
+</head>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
    "build": "rimraf build && webpack",
    "package:lib": "npm run build && cp ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
    "publish:lib": "npm run build && cd build && npm publish",
-    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
-    "lint": "tslint -p tsconfig.json",
+    "lint:fix": "npx prettier --write 'src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}'",
+    "lint": "npx prettier --check 'src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}'",
    "test": "jest",
    "prepublishOnly": "cp -r ./build/* . && rm -rf ./build",
    "postpublish": "git clean -fd",
@@ -37,23 +37,22 @@
  "license": "ISC",
  "devDependencies": {
    "@types/isomorphic-fetch": "0.0.35",
-    "@types/jest": "^26.0.4",
+    "@types/jest": "^26.0.10",
    "cp": "^0.2.0",
    "jest": "^25.5.4",
    "path": "^0.12.7",
-    "prettier": "^2.0.5",
    "rimraf": "^3.0.2",
    "semantic-release": "^17.1.1",
    "ts-jest": "^25.5.1",
-    "ts-loader": "^8.0.1",
-    "tslint": "^6.1.2",
+    "ts-loader": "^8.0.3",
+    "tslint": "^6.1.3",
    "tslint-config-prettier": "^1.18.0",
    "typedoc": "^0.17.8",
    "typedoc-neo-theme": "^1.0.9",
    "typedoc-plugin-external-module-name": "^4.0.3",
-    "typescript": "^3.9.6",
+    "typescript": "^3.9.7",
    "uglifyjs-webpack-plugin": "^2.2.0",
-    "webpack": "^4.43.0",
+    "webpack": "^4.44.1",
    "webpack-cli": "^3.3.12"
  },
  "main": "index.js",
--- a/sasjs-tests/.prettierrc
+++ b/sasjs-tests/.prettierrc
@@ -0,0 +1,6 @@
+{
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": false
+}
--- a/sasjs-tests/package-lock.json
+++ b/sasjs-tests/package-lock.json
@@ -1357,9 +1357,9 @@
      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
    },
    "@sasjs/adapter": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.0.5.tgz",
-      "integrity": "sha512-54gQZD7QdNmQu77axOqr0vMS7hUVXO5hPbUtwXXocMIi3kRQDbROYjC3kuiFM9FrxqiZWbLRcyOqmFv3W/N36w==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.3.6.tgz",
+      "integrity": "sha512-d2B+cTII+vabKCU8mJy90mEz3tCWw2pEp4qIBGsDamJiTS0Rx69dgXGHuRUm8KtjLDHHrzwXATsqviU3dnU0QQ==",
      "requires": {
        "es6-promise": "^4.2.8",
        "form-data": "^3.0.0",
@@ -1378,11 +1378,59 @@
        }
      }
    },
+    "@sasjs/test-framework": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@sasjs/test-framework/-/test-framework-1.4.0.tgz",
+      "integrity": "sha512-Pd8PUH5B5RO6q4w3OQXX7aWicvA/CJMXA/FCf2xp332ZTKBb/5uV+HphAOFKpCh58y+ykYYVSV0ZaDO/4t1h3A==",
+      "requires": {
+        "@types/react-highlight.js": "^1.0.0",
+        "immer": "^7.0.7",
+        "moment": "^2.27.0",
+        "react-highlight.js": "^1.0.7",
+        "semantic-ui-css": "^2.4.1",
+        "semantic-ui-react": "^1.0.0"
+      },
+      "dependencies": {
+        "immer": {
+          "version": "7.0.7",
+          "resolved": "https://registry.npmjs.org/immer/-/immer-7.0.7.tgz",
+          "integrity": "sha512-Q8yYwVADJXrNfp1ZUAh4XDHkcoE3wpdpb4mC5abDSajs2EbW8+cGdPyAnglMyLnm7EF6ojD2xBFX7L5i4TIytw=="
+        }
+      }
+    },
+    "@semantic-ui-react/event-stack": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@semantic-ui-react/event-stack/-/event-stack-3.1.1.tgz",
+      "integrity": "sha512-SA7VOu/tY3OkooR++mm9voeQrJpYXjJaMHO1aFCcSouS2xhqMR9Gnz0LEGLOR0h9ueWPBKaQzKIrx3FTTJZmUQ==",
+      "requires": {
+        "exenv": "^1.2.2",
+        "prop-types": "^15.6.2"
+      }
+    },
    "@sheerun/mutationobserver-shim": {
      "version": "0.3.3",
      "resolved": "https://registry.npmjs.org/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz",
      "integrity": "sha512-DetpxZw1fzPD5xUBrIAoplLChO2VB8DlL5Gg+I1IR9b2wPqYIca2WSUxL5g1vLeR4MsQq1NeWriXAVffV+U1Fw=="
    },
+    "@stardust-ui/react-component-event-listener": {
+      "version": "0.38.0",
+      "resolved": "https://registry.npmjs.org/@stardust-ui/react-component-event-listener/-/react-component-event-listener-0.38.0.tgz",
+      "integrity": "sha512-sIP/e0dyOrrlb8K7KWumfMxj/gAifswTBC4o68Aa+C/GA73ccRp/6W1VlHvF/dlOR4KLsA+5SKnhjH36xzPsWg==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "prop-types": "^15.7.2"
+      }
+    },
+    "@stardust-ui/react-component-ref": {
+      "version": "0.38.0",
+      "resolved": "https://registry.npmjs.org/@stardust-ui/react-component-ref/-/react-component-ref-0.38.0.tgz",
+      "integrity": "sha512-xjs6WnvJVueSIXMWw0C3oWIgAPpcD03qw43oGOjUXqFktvpNkB73JoKIhS4sCrtQxBdct75qqr4ZL6JiyPcESw==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "prop-types": "^15.7.2",
+        "react-is": "^16.6.3"
+      }
+    },
    "@svgr/babel-plugin-add-jsx-attribute": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz",
@@ -1858,6 +1906,14 @@
        "@types/react": "*"
      }
    },
+    "@types/react-highlight.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/react-highlight.js/-/react-highlight.js-1.0.0.tgz",
+      "integrity": "sha512-5VXEuo2O9L66y/2GDQSGFTggQkpOvDc/p2ma1KHadu7o/H720HK3Fr83epd4wtQky7B/RoCPat0SKyhlhiUo7A==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
    "@types/react-router": {
      "version": "5.1.8",
      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.8.tgz",
@@ -3776,6 +3832,11 @@
        "shallow-clone": "^0.1.2"
      }
    },
+    "clsx": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
+      "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="
+    },
    "co": {
      "version": "4.6.0",
      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -4117,6 +4178,15 @@
        "sha.js": "^2.4.8"
      }
    },
+    "create-react-context": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz",
+      "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==",
+      "requires": {
+        "gud": "^1.0.0",
+        "warning": "^4.0.3"
+      }
+    },
    "cross-spawn": {
      "version": "6.0.5",
      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -5641,6 +5711,11 @@
        "strip-eof": "^1.0.0"
      }
    },
+    "exenv": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
+      "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
+    },
    "exit": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
@@ -6510,6 +6585,11 @@
      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
    },
+    "gud": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
+      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
+    },
    "gzip-size": {
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
@@ -6654,6 +6734,11 @@
      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
    },
+    "highlight.js": {
+      "version": "9.18.3",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.3.tgz",
+      "integrity": "sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ=="
+    },
    "history": {
      "version": "4.10.1",
      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
@@ -8006,6 +8091,11 @@
        }
      }
    },
+    "jquery": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+    },
    "js-base64": {
      "version": "2.6.2",
      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.2.tgz",
@@ -8155,6 +8245,11 @@
        "object.assign": "^4.1.0"
      }
    },
+    "keyboard-key": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/keyboard-key/-/keyboard-key-1.1.0.tgz",
+      "integrity": "sha512-qkBzPTi3rlAKvX7k0/ub44sqOfXeLc/jcnGGmj5c7BJpU8eDrEVPyhCvNYAaoubbsLm9uGWwQJO1ytQK1a9/dQ=="
+    },
    "killable": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -8919,6 +9014,11 @@
        "minimist": "^1.2.5"
      }
    },
+    "moment": {
+      "version": "2.27.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
+      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+    },
    "move-concurrently": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -9912,6 +10012,11 @@
        "ts-pnp": "^1.1.6"
      }
    },
+    "popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
+    },
    "portfinder": {
      "version": "1.0.26",
      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
@@ -11353,11 +11458,34 @@
      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz",
      "integrity": "sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA=="
    },
+    "react-highlight.js": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/react-highlight.js/-/react-highlight.js-1.0.7.tgz",
+      "integrity": "sha512-OVPKnV0ZvU+V//HExwbV8M9CWy49Eo/9y9pBN2OsNWUFPN6dE4YZBLmJW/5sM2DxI5v/QQLyxOnTnSSfGCP+9Q==",
+      "requires": {
+        "highlight.js": "^9.3.0",
+        "prop-types": "^15.6.0"
+      }
+    },
    "react-is": {
      "version": "16.13.1",
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
    },
+    "react-popper": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.7.tgz",
+      "integrity": "sha512-nmqYTx7QVjCm3WUZLeuOomna138R1luC4EqkW3hxJUrAe+3eNz3oFCLYdnPwILfn0mX1Ew2c3wctrjlUMYYUww==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "create-react-context": "^0.3.0",
+        "deep-equal": "^1.1.1",
+        "popper.js": "^1.14.4",
+        "prop-types": "^15.6.1",
+        "typed-styles": "^0.0.7",
+        "warning": "^4.0.2"
+      }
+    },
    "react-router": {
      "version": "5.2.0",
      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
@@ -12097,6 +12225,47 @@
        "node-forge": "0.9.0"
      }
    },
+    "semantic-ui-css": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/semantic-ui-css/-/semantic-ui-css-2.4.1.tgz",
+      "integrity": "sha512-Pkp0p9oWOxlH0kODx7qFpIRYpK1T4WJOO4lNnpNPOoWKCrYsfHqYSKgk5fHfQtnWnsAKy7nLJMW02bgDWWFZFg==",
+      "requires": {
+        "jquery": "x.*"
+      }
+    },
+    "semantic-ui-react": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-1.2.0.tgz",
+      "integrity": "sha512-9tNL94nEy16RdupTQNiURyemWUIxtTpQgFimCbOOHRBOe1ApsFz3FWFsrGjv9zFtE7dQMslLYov9BQOelTCVwA==",
+      "requires": {
+        "@babel/runtime": "^7.10.5",
+        "@semantic-ui-react/event-stack": "^3.1.0",
+        "@stardust-ui/react-component-event-listener": "~0.38.0",
+        "@stardust-ui/react-component-ref": "~0.38.0",
+        "clsx": "^1.1.1",
+        "keyboard-key": "^1.1.0",
+        "lodash": "^4.17.19",
+        "prop-types": "^15.7.2",
+        "react-is": "^16.8.6",
+        "react-popper": "^1.3.7",
+        "shallowequal": "^1.1.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.11.2",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
+          "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "lodash": {
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+        }
+      }
+    },
    "semver": {
      "version": "6.3.0",
      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -12286,6 +12455,11 @@
        }
      }
    },
+    "shallowequal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
+    },
    "shebang-command": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -13454,6 +13628,11 @@
        "mime-types": "~2.1.24"
      }
    },
+    "typed-styles": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz",
+      "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q=="
+    },
    "typedarray": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -13755,6 +13934,14 @@
        "makeerror": "1.0.x"
      }
    },
+    "warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
    "watchpack": {
      "version": "1.7.2",
      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
--- a/sasjs-tests/package.json
+++ b/sasjs-tests/package.json
@@ -4,7 +4,8 @@
  "homepage": ".",
  "private": true,
  "dependencies": {
-    "@sasjs/adapter": "^1.0.5",
+    "@sasjs/adapter": "^1.3.6",
+    "@sasjs/test-framework": "^1.4.0",
    "@testing-library/jest-dom": "^4.2.4",
    "@testing-library/react": "^9.5.0",
    "@testing-library/user-event": "^7.2.1",
@@ -24,7 +25,7 @@
    "build": "react-scripts build",
    "test": "react-scripts test",
    "eject": "react-scripts eject",
-    "deploy": "npm run build && rsync -avhe ssh ./build/* --delete kriaco@sas.analytium.co.uk:/var/www/html/kriaco/sasjs-tests"
+    "deploy": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz && npm run build && rsync -avhe ssh ./build/* --delete kriaco@sas.analytium.co.uk:/var/www/html/kriaco/sasjs-tests"
  },
  "eslintConfig": {
    "extends": "react-app"
--- a/sasjs-tests/public/config.json
+++ b/sasjs-tests/public/config.json
@@ -6,6 +6,7 @@
    "appLoc": "/Public/app",
    "serverType": "SASVIYA",
    "debug": false,
-    "contextName": null
+    "contextName": "SharedCompute",
+    "useComputeApi": true
  }
 }
--- a/sasjs-tests/src/App.scss
+++ b/sasjs-tests/src/App.scss
@@ -1,102 +0,0 @@
-.app {
-  padding: 16px;
-
-  .controls {
-    display: flex;
-    align-items: center;
-    .debug-toggle,
-    .app-loc-input,
-    .submit-button {
-      margin: 16px 0;
-    }
-
-    .row {
-      margin: 16px;
-
-      &.app-loc {
-        width: 20vw;
-      }
-    }
-
-    .submit-button {
-      padding: 16px;
-      font-size: 1.25em;
-    }
-
-    .app-loc-input {
-      width: 100%;
-    }
-  }
-
-  .debug-toggle {
-    display: inline-flex;
-    justify-content: center;
-    align-items: center;
-
-    .label {
-      padding: 0 8px;
-      font-size: 1.25em;
-    }
-  }
-
-  $height: 40px;
-  $width: 70px;
-  .switch {
-    position: relative;
-    display: inline-flex;
-    width: $width;
-    height: $height;
-
-    input[type="checkbox"] {
-      display: none;
-    }
-    input:checked + .knob {
-      animation: colorChange 0.4s linear forwards;
-    }
-    input:checked + .knob:before {
-      animation: turnON 0.4s linear forwards;
-    }
-  }
-
-  @keyframes colorChange {
-    from {
-      background-color: #ccc;
-    }
-    50% {
-      background-color: #a4d9ad;
-    }
-    to {
-      background-color: #4bd663;
-    }
-  }
-  @keyframes turnON {
-    from {
-      transform: translateX(0px);
-    }
-    to {
-      transform: translateX($width - ($height * 0.99));
-      box-shadow: -10px 0px 44px 0px #434343;
-    }
-  }
-
-  .knob {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: #ccc;
-    border-radius: $height;
-  }
-
-  .knob:before {
-    position: absolute;
-    background-color: white;
-    content: "";
-    left: $height * 0.1;
-    top: $height * 0.1;
-    width: ($height * 0.8);
-    height: ($height * 0.8);
-    border-radius: 50%;
-  }
-}
--- a/sasjs-tests/src/App.test.js
+++ b/sasjs-tests/src/App.test.js
@@ -1,8 +1,8 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import App from './App';
+import React from "react";
+import { render } from "@testing-library/react";
+import App from "./App";

-test('renders learn react link', () => {
+test("renders learn react link", () => {
  const { getByText } = render(<App />);
  const linkElement = getByText(/learn react/i);
  expect(linkElement).toBeInTheDocument();
--- a/sasjs-tests/src/App.tsx
+++ b/sasjs-tests/src/App.tsx
@@ -1,56 +1,30 @@
 import React, { ReactElement, useState, useContext, useEffect } from "react";
-import "./App.scss";
-import TestSuiteRunner from "./TestSuiteRunner";
-import { AppContext } from "./context/AppContext";
+import { TestSuiteRunner, TestSuite, AppContext } from "@sasjs/test-framework";
+import { basicTests } from "./testSuites/Basic";
+import { sendArrTests, sendObjTests } from "./testSuites/RequestData";
+import { specialCaseTests } from "./testSuites/SpecialCases";
+import { sasjsRequestTests } from "./testSuites/SasjsRequests";
+import "@sasjs/test-framework/dist/index.css";

 const App = (): ReactElement<{}> => {
-  const [appLoc, setAppLoc] = useState("");
-  const [debug, setDebug] = useState(false);
-  const { adapter } = useContext(AppContext);
+  const { adapter, config } = useContext(AppContext);
+  const [testSuites, setTestSuites] = useState<TestSuite[]>([]);

  useEffect(() => {
    if (adapter) {
-      adapter.setDebugState(debug);
+      setTestSuites([
+        basicTests(adapter, config.userName, config.password),
+        sendArrTests(adapter),
+        sendObjTests(adapter),
+        specialCaseTests(adapter),
+        sasjsRequestTests(adapter)
+      ]);
    }
-  }, [debug, adapter]);
-
-  useEffect(() => {
-    if (appLoc && adapter) {
-      adapter.setSASjsConfig({ ...adapter.getSasjsConfig(), appLoc });
-    }
-  }, [appLoc, adapter]);
-
-  useEffect(() => {
-    setAppLoc(adapter.getSasjsConfig().appLoc);
-  }, [adapter]);
+  }, [adapter, config]);

  return (
    <div className="app">
-      <div className="controls">
-        <div className="row">
-          <label>Debug</label>
-          <div className="debug-toggle">
-            <label className="switch">
-              <input
-                type="checkbox"
-                onChange={(e) => setDebug(e.target.checked)}
-              />
-              <span className="knob"></span>
-            </label>
-          </div>
-        </div>
-        <div className="row app-loc">
-          <label>App Loc</label>
-          <input
-            type="text"
-            className="app-loc-input"
-            value={appLoc}
-            onChange={(e) => setAppLoc(e.target.value)}
-            placeholder="AppLoc"
-          />
-        </div>
-      </div>
-      {adapter && <TestSuiteRunner adapter={adapter} />}
+      {adapter && testSuites && <TestSuiteRunner testSuites={testSuites} />}
    </div>
  );
 };
--- a/sasjs-tests/src/Login.tsx
+++ b/sasjs-tests/src/Login.tsx
@@ -1,6 +1,6 @@
 import React, { ReactElement, useState, useCallback, useContext } from "react";
 import "./Login.scss";
-import { AppContext } from "./context/AppContext";
+import { AppContext } from "@sasjs/test-framework";
 import { Redirect } from "react-router-dom";

 const Login = (): ReactElement<{}> => {
@@ -11,8 +11,8 @@ const Login = (): ReactElement<{}> => {
  const handleSubmit = useCallback(
    (e) => {
      e.preventDefault();
-      appContext.adapter.logIn(username, password).then(() => {
-        appContext.setIsLoggedIn(true);
+      appContext.adapter.logIn(username, password).then((res) => {
+        appContext.setIsLoggedIn(res.isLoggedIn);
      });
    },
    [username, password, appContext]
--- a/sasjs-tests/src/PrivateRoute.tsx
+++ b/sasjs-tests/src/PrivateRoute.tsx
@@ -1,6 +1,6 @@
 import React, { ReactElement, useContext, FunctionComponent } from "react";
 import { Redirect, Route } from "react-router-dom";
-import { AppContext } from "./context/AppContext";
+import { AppContext } from "@sasjs/test-framework";

 interface PrivateRouteProps {
  component: FunctionComponent;
--- a/sasjs-tests/src/TestSuiteRunner.scss
+++ b/sasjs-tests/src/TestSuiteRunner.scss
@@ -1,19 +0,0 @@
-.button-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 16px;
-
-  .loading-spinner {
-    margin: 0 8px;
-  }
-
-  .submit-button {
-    padding: 10px;
-    min-height: 80px;
-    font-size: 2em;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-}
--- a/sasjs-tests/src/TestSuiteRunner.tsx
+++ b/sasjs-tests/src/TestSuiteRunner.tsx
@@ -1,126 +0,0 @@
-import React, { useEffect, useState, ReactElement, useContext } from "react";
-import TestSuiteComponent from "./components/TestSuite";
-import TestSuiteCard from "./components/TestSuiteCard";
-import { TestSuite, Test } from "./types";
-import { basicTests } from "./testSuites/Basic";
-import "./TestSuiteRunner.scss";
-import SASjs from "@sasjs/adapter";
-import { AppContext } from "./context/AppContext";
-import { sendArrTests, sendObjTests } from "./testSuites/RequestData";
-import { specialCaseTests } from "./testSuites/SpecialCases";
-import { sasjsRequestTests } from "./testSuites/SasjsRequests";
-
-interface TestSuiteRunnerProps {
-  adapter: SASjs;
-}
-const TestSuiteRunner = (
-  props: TestSuiteRunnerProps
-): ReactElement<TestSuiteRunnerProps> => {
-  const { adapter } = props;
-  const { config } = useContext(AppContext);
-  const [testSuites, setTestSuites] = useState<TestSuite[]>([]);
-  const [runTests, setRunTests] = useState(false);
-  const [completedTestSuites, setCompletedTestSuites] = useState<
-    {
-      name: string;
-      completedTests: {
-        test: Test;
-        result: boolean;
-        error: Error | null;
-        executionTime: number;
-      }[];
-    }[]
-  >([]);
-  const [currentTestSuite, setCurrentTestSuite] = useState<TestSuite | null>(
-    (null as unknown) as TestSuite
-  );
-
-  useEffect(() => {
-    if (adapter) {
-      setTestSuites([
-        basicTests(adapter, config.userName, config.password),
-        sendArrTests(adapter),
-        sendObjTests(adapter),
-        specialCaseTests(adapter),
-        sasjsRequestTests(adapter),
-      ]);
-      setCompletedTestSuites([]);
-    }
-  }, [adapter]);
-
-  useEffect(() => {
-    if (testSuites.length) {
-      setCurrentTestSuite(testSuites[0]);
-    }
-  }, [testSuites]);
-
-  useEffect(() => {
-    if (runTests) {
-      setCompletedTestSuites([]);
-      setCurrentTestSuite(testSuites[0]);
-    }
-  }, [runTests, testSuites]);
-
-  return (
-    <>
-      <div className="button-container">
-        <button
-          className={runTests ? "submit-button disabled" : "submit-button"}
-          onClick={() => setRunTests(true)}
-          disabled={runTests}
-        >
-          {runTests ? (
-            <>
-              <div className="loading-spinner"></div>Running tests...
-            </>
-          ) : (
-            "Run tests!"
-          )}
-        </button>
-      </div>
-      {completedTestSuites.map((completedTestSuite, index) => {
-        return (
-          <TestSuiteCard
-            key={index}
-            tests={completedTestSuite.completedTests}
-            name={completedTestSuite.name}
-          />
-        );
-      })}
-      {currentTestSuite && runTests && (
-        <TestSuiteComponent
-          {...currentTestSuite}
-          onCompleted={(
-            name,
-            completedTests: {
-              test: Test;
-              result: boolean;
-              error: Error | null;
-              executionTime: number;
-            }[]
-          ) => {
-            const currentIndex = testSuites.indexOf(currentTestSuite);
-            const nextIndex =
-              currentIndex < testSuites.length - 1 ? currentIndex + 1 : -1;
-            if (nextIndex >= 0) {
-              setCurrentTestSuite(testSuites[nextIndex]);
-            } else {
-              setCurrentTestSuite(null);
-            }
-            const newCompletedTestSuites = [
-              ...completedTestSuites,
-              { name, completedTests },
-            ];
-            setCompletedTestSuites(newCompletedTestSuites);
-
-            if (newCompletedTestSuites.length === testSuites.length) {
-              setRunTests(false);
-            }
-          }}
-        />
-      )}
-    </>
-  );
-};
-
-export default TestSuiteRunner;
--- a/sasjs-tests/src/components/Test.tsx
+++ b/sasjs-tests/src/components/Test.tsx
@@ -1,79 +0,0 @@
-import React, { ReactElement, useEffect, useState } from "react";
-import TestCard from "./TestCard";
-import { start } from "repl";
-
-interface TestProps {
-  title: string;
-  description: string;
-  beforeTest?: (...args: any) => Promise<any>;
-  afterTest?: (...args: any) => Promise<any>;
-  test: (context: any) => Promise<any>;
-  assertion: (...args: any) => boolean;
-  onCompleted: (payload: {
-    result: boolean;
-    error: Error | null;
-    executionTime: number;
-  }) => void;
-  context: any;
-}
-
-const getStatus = (isRunning: boolean, isPassed: boolean): string => {
-  return isRunning ? "running" : isPassed ? "passed" : "failed";
-};
-
-const Test = (props: TestProps): ReactElement<TestProps> => {
-  const {
-    title,
-    description,
-    test,
-    beforeTest,
-    afterTest,
-    assertion,
-    onCompleted,
-    context,
-  } = props;
-  const beforeTestFunction = beforeTest ? beforeTest : () => Promise.resolve();
-  const afterTestFunction = afterTest ? afterTest : () => Promise.resolve();
-  const [isRunning, setIsRunning] = useState(false);
-  const [isPassed, setIsPassed] = useState(false);
-
-  useEffect(() => {
-    if (test && assertion) {
-      const startTime = new Date().valueOf();
-      setIsRunning(true);
-      setIsPassed(false);
-      beforeTestFunction()
-        .then(() => test(context))
-        .then((res) => {
-          setIsRunning(false);
-          setIsPassed(assertion(res, context));
-          return Promise.resolve(assertion(res, context));
-        })
-        .then((testResult) => {
-          afterTestFunction();
-          const endTime = new Date().valueOf();
-          const executionTime = (endTime - startTime) / 1000;
-          onCompleted({ result: testResult, error: null, executionTime });
-        })
-        .catch((e) => {
-          setIsRunning(false);
-          setIsPassed(false);
-          console.error(e);
-          const endTime = new Date().valueOf();
-          const executionTime = (endTime - startTime) / 1000;
-          onCompleted({ result: false, error: e, executionTime });
-        });
-    }
-  }, [test, assertion]);
-
-  return (
-    <TestCard
-      title={title}
-      description={description}
-      status={getStatus(isRunning, isPassed)}
-      error={null}
-    />
-  );
-};
-
-export default Test;
--- a/sasjs-tests/src/components/TestCard.scss
+++ b/sasjs-tests/src/components/TestCard.scss
@@ -1,62 +0,0 @@
-.test {
-  display: inline-flex;
-  padding: 8px;
-  margin: 8px;
-  flex-direction: column;
-  border: 1px solid #ddd;
-  border-radius: 5px;
-  width: 20%;
-
-  .title {
-    font-weight: bold;
-    color: #eee;
-    font-size: 1em;
-  }
-
-  .description,
-  .execution-time {
-    color: #c6c0c0;
-    padding: 8px 0;
-    font-size: 0.8em;
-  }
-
-  .description {
-    min-height: 50px;
-  }
-
-  .execution-time {
-    color: #f9e804;
-  }
-
-  .icon {
-    border-radius: 50%;
-    width: 12px;
-    height: 12px;
-    margin-right: 8px;
-    display: inline-block;
-
-    &.running {
-      background-color: yellow;
-    }
-
-    &.passed {
-      background-color: green;
-    }
-
-    &.failed {
-      background-color: red;
-    }
-  }
-}
-
-@media only screen and (max-width: 900px) {
-  .test {
-    width: 90%;
-  }
-}
-
-@media only screen and (min-width: 901px) and (max-width: 1280px) {
-  .test {
-    width: 30%;
-  }
-}
--- a/sasjs-tests/src/components/TestCard.tsx
+++ b/sasjs-tests/src/components/TestCard.tsx
@@ -1,43 +0,0 @@
-import React, { ReactElement } from "react";
-import "./TestCard.scss";
-
-interface TestCardProps {
-  title: string;
-  description: string;
-  status: string;
-  error: Error | null;
-  executionTime?: number;
-}
-const TestCard = (props: TestCardProps): ReactElement<TestCardProps> => {
-  const { title, description, status, error, executionTime } = props;
-
-  return (
-    <div className="test">
-      <code className="title">{title}</code>
-      <span className="description">{description}</span>
-      <span className="execution-time">
-        {executionTime ? executionTime.toFixed(2) + "s" : ""}
-      </span>
-      {status === "running" && (
-        <div>
-          <span className="icon running"></span>Running...
-        </div>
-      )}
-      {status === "passed" && (
-        <div>
-          <span className="icon passed"></span>Passed
-        </div>
-      )}
-      {status === "failed" && (
-        <>
-          <div>
-            <span className="icon failed"></span>Failed
-          </div>
-          {!!error && <code>{error.message}</code>}
-        </>
-      )}
-    </div>
-  );
-};
-
-export default TestCard;
--- a/sasjs-tests/src/components/TestSuite.tsx
+++ b/sasjs-tests/src/components/TestSuite.tsx
@@ -1,106 +0,0 @@
-import React, { ReactElement, useState, useEffect } from "react";
-import "./TestSuiteCard.scss";
-import { Test } from "../types";
-import TestComponent from "./Test";
-import TestCard from "./TestCard";
-
-interface TestSuiteProps {
-  name: string;
-  tests: Test[];
-  beforeAll?: (...args: any) => Promise<any>;
-  afterAll?: (...args: any) => Promise<any>;
-  onCompleted: (
-    name: string,
-    completedTests: {
-      test: Test;
-      result: boolean;
-      error: Error | null;
-      executionTime: number;
-    }[]
-  ) => void;
-}
-const TestSuite = (props: TestSuiteProps): ReactElement<TestSuiteProps> => {
-  const { name, tests, beforeAll, afterAll, onCompleted } = props;
-  const [context, setContext] = useState<any>(null);
-  const [completedTests, setCompletedTests] = useState<
-    {
-      test: Test;
-      result: boolean;
-      error: Error | null;
-      executionTime: number;
-    }[]
-  >([]);
-  const [currentTest, setCurrentTest] = useState<Test | null>(
-    (null as unknown) as Test
-  );
-
-  useEffect(() => {
-    if (beforeAll) {
-      beforeAll().then((data) => setContext({ data }));
-    }
-  }, [beforeAll]);
-
-  useEffect(() => {
-    if (tests.length) {
-      setCurrentTest(tests[0]);
-    }
-    setCompletedTests([]);
-    setContext(null);
-  }, [tests]);
-
-  return (!!beforeAll && !!context) || !beforeAll ? (
-    <div className="test-suite">
-      <div className="test-suite-name running">{name}</div>
-      {currentTest && (
-        <TestComponent
-          {...currentTest}
-          context={context}
-          onCompleted={(completedTest) => {
-            const newCompleteTests = [
-              ...completedTests,
-              {
-                test: currentTest,
-                result: completedTest.result,
-                error: completedTest.error,
-                executionTime: completedTest.executionTime,
-              },
-            ];
-            setCompletedTests(newCompleteTests);
-            const currentIndex = tests.indexOf(currentTest);
-            const nextIndex =
-              currentIndex < tests.length - 1 ? currentIndex + 1 : -1;
-            if (nextIndex >= 0) {
-              setCurrentTest(tests[nextIndex]);
-            } else {
-              setCurrentTest(null);
-            }
-            if (newCompleteTests.length === tests.length) {
-              if (afterAll) {
-                afterAll().then(() => onCompleted(name, newCompleteTests));
-              } else {
-                onCompleted(name, newCompleteTests);
-              }
-            }
-          }}
-        />
-      )}
-      {completedTests.map((completedTest, index) => {
-        const { test, result, error } = completedTest;
-        const { title, description } = test;
-        return (
-          <TestCard
-            key={index}
-            title={title}
-            description={description}
-            status={result === true ? "passed" : "failed"}
-            error={error}
-          />
-        );
-      })}
-    </div>
-  ) : (
-    <></>
-  );
-};
-
-export default TestSuite;
--- a/sasjs-tests/src/components/TestSuiteCard.scss
+++ b/sasjs-tests/src/components/TestSuiteCard.scss
@@ -1,19 +0,0 @@
-.test-suite {
-    .test-suite-name {
-        font-size: 1.5em;
-        font-weight: bold;
-        color: #1f2027;
-
-        &.passed {
-            color: green;
-        }
-
-        &.failed {
-            color: red;
-        }
-
-        &.running {
-            color: yellow;
-        }
-    }
-}
--- a/sasjs-tests/src/components/TestSuiteCard.tsx
+++ b/sasjs-tests/src/components/TestSuiteCard.tsx
@@ -1,44 +0,0 @@
-import React, { ReactElement } from "react";
-import "./TestSuiteCard.scss";
-import { Test } from "../types";
-import TestCard from "./TestCard";
-
-interface TestSuiteCardProps {
-  name: string;
-  tests: {
-    test: Test;
-    result: boolean;
-    error: Error | null;
-    executionTime: number;
-  }[];
-}
-const TestSuiteCard = (
-  props: TestSuiteCardProps
-): ReactElement<TestSuiteCardProps> => {
-  const { name, tests } = props;
-  const overallStatus = tests.map((t) => t.result).reduce((x, y) => x && y);
-
-  return (
-    <div className="test-suite">
-      <div className={`test-suite-name ${overallStatus ? "passed" : "failed"}`}>
-        {name}
-      </div>
-      {tests.map((completedTest, index) => {
-        const { test, result, error, executionTime } = completedTest;
-        const { title, description } = test;
-        return (
-          <TestCard
-            key={index}
-            title={title}
-            description={description}
-            status={result === true ? "passed" : "failed"}
-            error={error}
-            executionTime={executionTime}
-          />
-        );
-      })}
-    </div>
-  );
-};
-
-export default TestSuiteCard;
--- a/sasjs-tests/src/context/AppContext.tsx
+++ b/sasjs-tests/src/context/AppContext.tsx
@@ -1,53 +0,0 @@
-import React, { createContext, useState, useEffect, ReactNode } from "react";
-import SASjs from "@sasjs/adapter";
-
-export const AppContext = createContext<{
-  config: any;
-  sasJsConfig: any;
-  isLoggedIn: boolean;
-  setIsLoggedIn: (value: boolean) => void;
-  adapter: SASjs;
-}>({
-  config: null,
-  sasJsConfig: null,
-  isLoggedIn: false,
-  setIsLoggedIn: (null as unknown) as (value: boolean) => void,
-  adapter: (null as unknown) as SASjs,
-});
-
-export const AppProvider = (props: { children: ReactNode }) => {
-  const [config, setConfig] = useState<{ sasJsConfig: any }>({
-    sasJsConfig: null,
-  });
-
-  const [adapter, setAdapter] = useState<SASjs>((null as unknown) as SASjs);
-
-  const [isLoggedIn, setIsLoggedIn] = useState(false);
-
-  useEffect(() => {
-    fetch("config.json")
-      .then((res) => res.json())
-      .then((configJson: any) => {
-        setConfig(configJson);
-        const sasjs = new SASjs(configJson.sasJsConfig);
-        setAdapter(sasjs);
-        sasjs.checkSession().then((response) => {
-          setIsLoggedIn(response.isLoggedIn);
-        });
-      });
-  }, []);
-
-  return (
-    <AppContext.Provider
-      value={{
-        config,
-        sasJsConfig: config.sasJsConfig,
-        isLoggedIn,
-        setIsLoggedIn,
-        adapter,
-      }}
-    >
-      {props.children}
-    </AppContext.Provider>
-  );
-};
--- a/sasjs-tests/src/index.scss
+++ b/sasjs-tests/src/index.scss
@@ -1,8 +1,7 @@
 body {
  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
-    "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
-    sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans",
+    "Droid Sans", "Helvetica Neue", sans-serif;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  background-color: #1f2027;
@@ -10,8 +9,7 @@ body {
 }

 * {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
-    monospace;
+  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
 }

 input {
--- a/sasjs-tests/src/index.tsx
+++ b/sasjs-tests/src/index.tsx
@@ -3,7 +3,7 @@ import ReactDOM from "react-dom";
 import { Route, HashRouter, Switch } from "react-router-dom";
 import "./index.scss";
 import * as serviceWorker from "./serviceWorker";
-import { AppProvider } from "./context/AppContext";
+import { AppProvider } from "@sasjs/test-framework";
 import PrivateRoute from "./PrivateRoute";
 import Login from "./Login";
 import App from "./App";
--- a/sasjs-tests/src/serviceWorker.js
+++ b/sasjs-tests/src/serviceWorker.js
@@ -11,9 +11,9 @@
 // opt-in, read https://bit.ly/CRA-PWA

 const isLocalhost = Boolean(
-  window.location.hostname === 'localhost' ||
+  window.location.hostname === "localhost" ||
    // [::1] is the IPv6 localhost address.
-    window.location.hostname === '[::1]' ||
+    window.location.hostname === "[::1]" ||
    // 127.0.0.0/8 are considered localhost for IPv4.
    window.location.hostname.match(
      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
@@ -21,7 +21,7 @@ const isLocalhost = Boolean(
 );

 export function register(config) {
-  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+  if (process.env.NODE_ENV === "production" && "serviceWorker" in navigator) {
    // The URL constructor is available in all browsers that support SW.
    const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
    if (publicUrl.origin !== window.location.origin) {
@@ -31,7 +31,7 @@ export function register(config) {
      return;
    }

-    window.addEventListener('load', () => {
+    window.addEventListener("load", () => {
      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;

      if (isLocalhost) {
@@ -42,8 +42,8 @@ export function register(config) {
        // service worker/PWA documentation.
        navigator.serviceWorker.ready.then(() => {
          console.log(
-            'This web app is being served cache-first by a service ' +
-              'worker. To learn more, visit https://bit.ly/CRA-PWA'
+            "This web app is being served cache-first by a service " +
+              "worker. To learn more, visit https://bit.ly/CRA-PWA"
          );
        });
      } else {
@@ -57,21 +57,21 @@ export function register(config) {
 function registerValidSW(swUrl, config) {
  navigator.serviceWorker
    .register(swUrl)
-    .then(registration => {
+    .then((registration) => {
      registration.onupdatefound = () => {
        const installingWorker = registration.installing;
        if (installingWorker == null) {
          return;
        }
        installingWorker.onstatechange = () => {
-          if (installingWorker.state === 'installed') {
+          if (installingWorker.state === "installed") {
            if (navigator.serviceWorker.controller) {
              // At this point, the updated precached content has been fetched,
              // but the previous service worker will still serve the older
              // content until all client tabs are closed.
              console.log(
-                'New content is available and will be used when all ' +
-                  'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
+                "New content is available and will be used when all " +
+                  "tabs for this page are closed. See https://bit.ly/CRA-PWA."
              );

              // Execute callback
@@ -82,7 +82,7 @@ function registerValidSW(swUrl, config) {
              // At this point, everything has been precached.
              // It's the perfect time to display a
              // "Content is cached for offline use." message.
-              console.log('Content is cached for offline use.');
+              console.log("Content is cached for offline use.");

              // Execute callback
              if (config && config.onSuccess) {
@@ -93,25 +93,25 @@ function registerValidSW(swUrl, config) {
        };
      };
    })
-    .catch(error => {
-      console.error('Error during service worker registration:', error);
+    .catch((error) => {
+      console.error("Error during service worker registration:", error);
    });
 }

 function checkValidServiceWorker(swUrl, config) {
  // Check if the service worker can be found. If it can't reload the page.
  fetch(swUrl, {
-    headers: { 'Service-Worker': 'script' },
+    headers: { "Service-Worker": "script" }
  })
-    .then(response => {
+    .then((response) => {
      // Ensure service worker exists, and that we really are getting a JS file.
-      const contentType = response.headers.get('content-type');
+      const contentType = response.headers.get("content-type");
      if (
        response.status === 404 ||
-        (contentType != null && contentType.indexOf('javascript') === -1)
+        (contentType != null && contentType.indexOf("javascript") === -1)
      ) {
        // No service worker found. Probably a different app. Reload the page.
-        navigator.serviceWorker.ready.then(registration => {
+        navigator.serviceWorker.ready.then((registration) => {
          registration.unregister().then(() => {
            window.location.reload();
          });
@@ -123,18 +123,18 @@ function checkValidServiceWorker(swUrl, config) {
    })
    .catch(() => {
      console.log(
-        'No internet connection found. App is running in offline mode.'
+        "No internet connection found. App is running in offline mode."
      );
    });
 }

 export function unregister() {
-  if ('serviceWorker' in navigator) {
+  if ("serviceWorker" in navigator) {
    navigator.serviceWorker.ready
-      .then(registration => {
+      .then((registration) => {
        registration.unregister();
      })
-      .catch(error => {
+      .catch((error) => {
        console.error(error.message);
      });
  }
--- a/sasjs-tests/src/setupTests.js
+++ b/sasjs-tests/src/setupTests.js
@@ -2,4 +2,4 @@
 // allows you to do things like:
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom/extend-expect';
+import "@testing-library/jest-dom/extend-expect";
--- a/sasjs-tests/src/testSuites/Basic.ts
+++ b/sasjs-tests/src/testSuites/Basic.ts
@@ -1,5 +1,5 @@
 import SASjs, { ServerType, SASjsConfig } from "@sasjs/adapter";
-import { TestSuite } from "../types";
+import { TestSuite } from "@sasjs/test-framework";

 const defaultConfig: SASjsConfig = {
  serverUrl: window.location.origin,
@@ -9,6 +9,7 @@ const defaultConfig: SASjsConfig = {
  serverType: ServerType.SASViya,
  debug: true,
  contextName: "SAS Job Execution compute context",
+  useComputeApi: false
 };

 const customConfig = {
@@ -17,7 +18,7 @@ const customConfig = {
  pathSASViya: "viya",
  appLoc: "/Public/seedapp",
  serverType: ServerType.SAS9,
-  debug: false,
+  debug: false
 };

 export const basicTests = (
@@ -34,7 +35,7 @@ export const basicTests = (
        return adapter.logIn(userName, password);
      },
      assertion: (response: any) =>
-        response && response.isLoggedIn && response.userName === userName,
+        response && response.isLoggedIn && response.userName === userName
    },
    {
      title: "Default config",
@@ -53,7 +54,7 @@ export const basicTests = (
          sasjsConfig.serverType === defaultConfig.serverType &&
          sasjsConfig.debug === defaultConfig.debug
        );
-      },
+      }
    },
    {
      title: "Custom config",
@@ -71,7 +72,7 @@ export const basicTests = (
          sasjsConfig.serverType === customConfig.serverType &&
          sasjsConfig.debug === customConfig.debug
        );
-      },
+      }
    },
    {
      title: "Config overrides",
@@ -91,7 +92,7 @@ export const basicTests = (
          sasjsConfig.serverType === defaultConfig.serverType &&
          sasjsConfig.debug === false
        );
-      },
-    },
-  ],
+      }
+    }
+  ]
 });
--- a/sasjs-tests/src/testSuites/RequestData.ts
+++ b/sasjs-tests/src/testSuites/RequestData.ts
@@ -1,10 +1,10 @@
 import SASjs from "@sasjs/adapter";
-import { TestSuite } from "../types";
+import { TestSuite } from "@sasjs/test-framework";

 const stringData: any = { table1: [{ col1: "first col value" }] };
 const numericData: any = { table1: [{ col1: 3.14159265 }] };
 const multiColumnData: any = {
-  table1: [{ col1: 42, col2: 1.618, col3: "x", col4: "x" }],
+  table1: [{ col1: 42, col2: 1.618, col3: "x", col4: "x" }]
 };
 const multipleRowsWithNulls: any = {
  table1: [
@@ -12,8 +12,8 @@ const multipleRowsWithNulls: any = {
    { col1: 42, col2: null, col3: "x", col4: "" },
    { col1: 42, col2: null, col3: "x", col4: "" },
    { col1: 42, col2: 1.62, col3: "x", col4: "x" },
-    { col1: 42, col2: 1.62, col3: "x", col4: "x" },
-  ],
+    { col1: 42, col2: 1.62, col3: "x", col4: "x" }
+  ]
 };
 const multipleColumnsWithNulls: any = {
  table1: [
@@ -21,8 +21,8 @@ const multipleColumnsWithNulls: any = {
    { col1: 42, col2: null, col3: "x", col4: null },
    { col1: 42, col2: null, col3: "x", col4: null },
    { col1: 42, col2: null, col3: "x", col4: "" },
-    { col1: 42, col2: null, col3: "x", col4: "" },
-  ],
+    { col1: 42, col2: null, col3: "x", col4: "" }
+  ]
 };

 const getLongStringData = (length = 32764) => {
@@ -55,7 +55,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
      },
      assertion: (res: any) => {
        return res.table1[0][0] === stringData.table1[0].col1;
-      },
+      }
    },
    {
      title: "Long string value",
@@ -67,20 +67,19 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
      assertion: (res: any) => {
        const longStringData = getLongStringData();
        return res.table1[0][0] === longStringData.table1[0].col1;
-      },
+      }
    },
    {
      title: "Overly long string value",
      description:
        "Should error out with long string values over 32765 characters",
      test: () => {
-        return adapter
-          .request("common/sendArr", getLongStringData(32767))
-          .catch((e) => e);
+        const data = getLongStringData(32767);
+        return adapter.request("common/sendArr", data).catch((e) => e);
      },
      assertion: (error: any) => {
        return !!error && !!error.MESSAGE;
-      },
+      }
    },
    {
      title: "Single numeric value",
@@ -90,7 +89,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
      },
      assertion: (res: any) => {
        return res.table1[0][0] === numericData.table1[0].col1;
-      },
+      }
    },
    {
      title: "Multiple columns",
@@ -105,7 +104,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
          res.table1[0][2] === multiColumnData.table1[0].col3 &&
          res.table1[0][3] === multiColumnData.table1[0].col4
        );
-      },
+      }
    },
    {
      title: "Multiple rows with nulls",
@@ -130,7 +129,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
            res.table1[index][3] === multipleRowsWithNulls.table1[index].col4;
        });
        return result;
-      },
+      }
    },
    {
      title: "Multiple columns with nulls",
@@ -159,9 +158,9 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
              (multipleColumnsWithNulls.table1[index].col4 || "");
        });
        return result;
-      },
-    },
-  ],
+      }
+    }
+  ]
 });

 export const sendObjTests = (adapter: SASjs): TestSuite => ({
@@ -172,11 +171,11 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      description: "Should throw an error",
      test: async () => {
        const invalidData: any = {
-          "1 invalid table": [{ col1: 42 }],
+          "1 invalid table": [{ col1: 42 }]
        };
        return adapter.request("common/sendObj", invalidData).catch((e) => e);
      },
-      assertion: (error: any) => !!error && !!error.MESSAGE,
+      assertion: (error: any) => !!error && !!error.MESSAGE
    },
    {
      title: "Single string value",
@@ -186,7 +185,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      },
      assertion: (res: any) => {
        return res.table1[0].COL1 === stringData.table1[0].col1;
-      },
+      }
    },
    {
      title: "Long string value",
@@ -198,7 +197,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      assertion: (res: any) => {
        const longStringData = getLongStringData();
        return res.table1[0].COL1 === longStringData.table1[0].col1;
-      },
+      }
    },
    {
      title: "Overly long string value",
@@ -211,7 +210,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      },
      assertion: (error: any) => {
        return !!error && !!error.MESSAGE;
-      },
+      }
    },
    {
      title: "Single numeric value",
@@ -221,7 +220,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      },
      assertion: (res: any) => {
        return res.table1[0].COL1 === numericData.table1[0].col1;
-      },
+      }
    },

    {
@@ -233,7 +232,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      assertion: (res: any) => {
        const data = getLargeObjectData();
        return res.table1[9000].BIG === data.table1[9000].big;
-      },
+      }
    },
    {
      title: "Multiple columns",
@@ -248,7 +247,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
          res.table1[0].COL3 === multiColumnData.table1[0].col3 &&
          res.table1[0].COL4 === multiColumnData.table1[0].col4
        );
-      },
+      }
    },
    {
      title: "Multiple rows with nulls",
@@ -273,7 +272,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
            res.table1[index].COL4 === multipleRowsWithNulls.table1[index].col4;
        });
        return result;
-      },
+      }
    },
    {
      title: "Multiple columns with nulls",
@@ -302,7 +301,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
              (multipleColumnsWithNulls.table1[index].col4 || "");
        });
        return result;
-      },
-    },
-  ],
+      }
+    }
+  ]
 });
--- a/sasjs-tests/src/testSuites/SasjsRequests.ts
+++ b/sasjs-tests/src/testSuites/SasjsRequests.ts
@@ -1,5 +1,5 @@
 import SASjs from "@sasjs/adapter";
-import { TestSuite } from "../types";
+import { TestSuite } from "@sasjs/test-framework";

 const data: any = { table1: [{ col1: "first col value" }] };

@@ -19,7 +19,32 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
        } else {
          return requests[0].SASWORK === null;
        }
-      },
+      }
    },
-  ],
+    {
+      title: "Make error and capture log",
+      description: "Should make an error and capture log",
+      test: async () => {
+        return new Promise(async (resolve, reject) => {
+          adapter
+            .request("common/makeErr", data)
+            .then((res) => {
+              //no action here, this request must throw error
+            })
+            .catch((err) => {
+              let sasRequests = adapter.getSasRequests();
+              let makeErrRequest =
+                sasRequests.find((req) =>
+                  req.serviceLink.includes("makeErr")
+                ) || null;
+
+              resolve(!!makeErrRequest);
+            });
+        });
+      },
+      assertion: (response) => {
+        return response;
+      }
+    }
+  ]
 });
--- a/sasjs-tests/src/testSuites/SpecialCases.ts
+++ b/sasjs-tests/src/testSuites/SpecialCases.ts
@@ -1,5 +1,5 @@
 import SASjs from "@sasjs/adapter";
-import { TestSuite } from "../types";
+import { TestSuite } from "@sasjs/test-framework";

 const specialCharData: any = {
  table1: [
@@ -13,9 +13,9 @@ const specialCharData: any = {
      doubleQuote: '"',
      crlf: "\r\n",
      euro: "€euro",
-      banghash: "!#banghash",
-    },
-  ],
+      banghash: "!#banghash"
+    }
+  ]
 };

 const moreSpecialCharData: any = {
@@ -31,9 +31,9 @@ const moreSpecialCharData: any = {
      sigma: "Σsigma",
      at: "@at",
      serbian: "Српски",
-      dollar: "$",
-    },
-  ],
+      dollar: "$"
+    }
+  ]
 };

 const getWideData = () => {
@@ -43,7 +43,7 @@ const getWideData = () => {
  }

  const data: any = {
-    table1: [cols],
+    table1: [cols]
  };

  return data;
@@ -67,7 +67,7 @@ const getLargeDataset = () => {
  }

  const data: any = {
-    table1: rows,
+    table1: rows
  };

  return data;
@@ -75,7 +75,7 @@ const getLargeDataset = () => {

 const errorAndCsrfData: any = {
  error: [{ col1: "q", col2: "w", col3: "e", col4: "r" }],
-  _csrf: [{ col1: "q", col2: "w", col3: "e", col4: "r" }],
+  _csrf: [{ col1: "q", col2: "w", col3: "e", col4: "r" }]
 };

 export const specialCaseTests = (adapter: SASjs): TestSuite => ({
@@ -100,7 +100,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
          res.table1[0][8] === specialCharData.table1[0].euro &&
          res.table1[0][9] === specialCharData.table1[0].banghash
        );
-      },
+      }
    },
    {
      title: "Other special characters",
@@ -122,7 +122,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
          res.table1[0][9] === moreSpecialCharData.table1[0].serbian &&
          res.table1[0][10] === moreSpecialCharData.table1[0].dollar
        );
-      },
+      }
    },
    {
      title: "Wide table with sendArr",
@@ -138,7 +138,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
            result && res.table1[0][i] === data.table1[0]["col" + (i + 1)];
        }
        return result;
-      },
+      }
    },
    {
      title: "Wide table with sendObj",
@@ -155,7 +155,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
            res.table1[0]["COL" + (i + 1)] === data.table1[0]["col" + (i + 1)];
        }
        return result;
-      },
+      }
    },
    {
      title: "Multiple tables",
@@ -175,7 +175,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
          res.table50[0][2] === data.table50[0].col3 &&
          res.table50[0][3] === data.table50[0].col4
        );
-      },
+      }
    },
    {
      title: "Large dataset with sendObj",
@@ -190,7 +190,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
          result = result && res.table1[i][0] === data.table1[i][0];
        }
        return result;
-      },
+      }
    },
    {
      title: "Large dataset with sendArr",
@@ -206,7 +206,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
            result && res.table1[i][0] === Object.values(data.table1[i])[0];
        }
        return result;
-      },
+      }
    },
    {
      title: "Error and _csrf tables with sendArr",
@@ -225,7 +225,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
          res._csrf[0][2] === errorAndCsrfData._csrf[0].col3 &&
          res._csrf[0][3] === errorAndCsrfData._csrf[0].col4
        );
-      },
+      }
    },
    {
      title: "Error and _csrf tables with sendObj",
@@ -244,7 +244,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
          res._csrf[0].COL3 === errorAndCsrfData._csrf[0].col3 &&
          res._csrf[0].COL4 === errorAndCsrfData._csrf[0].col4
        );
-      },
-    },
-  ],
+      }
+    }
+  ]
 });
--- a/sasjs-tests/src/types/index.ts
+++ b/sasjs-tests/src/types/index.ts
@@ -1,15 +0,0 @@
-export interface Test {
-  title: string;
-  description: string;
-  beforeTest?: (...args: any) => Promise<any>;
-  afterTest?: (...args: any) => Promise<any>;
-  test: (context?: any) => Promise<any>;
-  assertion: (...args: any) => boolean;
-}
-
-export interface TestSuite {
-  name: string;
-  tests: Test[];
-  beforeAll?: (...args: any) => Promise<any>;
-  afterAll?: (...args: any) => Promise<any>;
-}
--- a/sasjs-tests/src/utils/UploadFile.ts
+++ b/sasjs-tests/src/utils/UploadFile.ts
@@ -1,23 +0,0 @@
-export const uploadFile = (file: File, fileName: string, url: string) => {
-  return new Promise((resolve, reject) => {
-    const data = new FormData();
-    data.append("file", file);
-    data.append("filename", fileName);
-    const xhr = new XMLHttpRequest();
-    xhr.withCredentials = true;
-    xhr.addEventListener("readystatechange", function () {
-      if (this.readyState === 4) {
-        let response: any;
-        try {
-          response = JSON.parse(this.responseText);
-        } catch (e) {
-          reject(e);
-        }
-        resolve(response);
-      }
-    });
-    xhr.open("POST", url);
-    xhr.setRequestHeader("cache-control", "no-cache");
-    xhr.send(data);
-  });
-};
--- a/src/FileUploader.ts
+++ b/src/FileUploader.ts
@@ -0,0 +1,100 @@
+import { isLogInRequired, needsRetry } from "./utils";
+import { CsrfToken } from "./types/CsrfToken";
+import { UploadFile } from "./types/UploadFile";
+
+const requestRetryLimit = 5;
+
+export class FileUploader {
+  constructor(
+    private appLoc: string,
+    private serverUrl: string,
+    private jobsPath: string,
+    private setCsrfTokenWeb: any,
+    private csrfToken: CsrfToken | null = null
+  ) {}
+  private retryCount = 0;
+
+  public uploadFile(sasJob: string, files: UploadFile[], params: any) {
+    if (files?.length < 1) throw new Error("Atleast one file must be provided");
+
+    let paramsString = "";
+
+    for (let param in params) {
+      if (params.hasOwnProperty(param)) {
+        paramsString += `&${param}=${params[param]}`;
+      }
+    }
+
+    const program = this.appLoc
+      ? this.appLoc.replace(/\/?$/, "/") + sasJob.replace(/^\//, "")
+      : sasJob;
+    const uploadUrl = `${this.serverUrl}${this.jobsPath}/?${
+      "_program=" + program
+    }${paramsString}`;
+
+    const headers = {
+      "cache-control": "no-cache"
+    };
+
+    return new Promise((resolve, reject) => {
+      const formData = new FormData();
+
+      for (let file of files) {
+        formData.append("file", file.file, file.fileName);
+      }
+
+      if (this.csrfToken) formData.append("_csrf", this.csrfToken.value);
+
+      fetch(uploadUrl, {
+        method: "POST",
+        body: formData,
+        referrerPolicy: "same-origin",
+        headers
+      })
+        .then(async (response) => {
+          if (!response.ok) {
+            if (response.status === 403) {
+              const tokenHeader = response.headers.get("X-CSRF-HEADER");
+
+              if (tokenHeader) {
+                const token = response.headers.get(tokenHeader);
+                this.csrfToken = {
+                  headerName: tokenHeader,
+                  value: token || ""
+                };
+
+                this.setCsrfTokenWeb(this.csrfToken);
+              }
+            }
+          }
+
+          return response.text();
+        })
+        .then((responseText) => {
+          if (isLogInRequired(responseText))
+            reject("You must be logged in to upload a fle");
+
+          if (needsRetry(responseText)) {
+            if (this.retryCount < requestRetryLimit) {
+              this.retryCount++;
+              this.uploadFile(sasJob, files, params).then(
+                (res: any) => resolve(res),
+                (err: any) => reject(err)
+              );
+            } else {
+              this.retryCount = 0;
+              reject(responseText);
+            }
+          } else {
+            this.retryCount = 0;
+
+            try {
+              resolve(JSON.parse(responseText));
+            } catch (e) {
+              reject(e);
+            }
+          }
+        });
+    });
+  }
+}
--- a/src/SAS9ApiClient.ts
+++ b/src/SAS9ApiClient.ts
@@ -10,7 +10,7 @@ export class SAS9ApiClient {
   */
  public getConfig() {
    return {
-      serverUrl: this.serverUrl,
+      serverUrl: this.serverUrl
    };
  }

@@ -37,9 +37,9 @@ export class SAS9ApiClient {
    const executeScriptRequest = {
      method: "PUT",
      headers: {
-        Accept: "application/json",
+        Accept: "application/json"
      },
-      body: `command=${requestPayload}`,
+      body: `command=${requestPayload}`
    };
    const executeScriptResponse = await fetch(
      `${this.serverUrl}/sas/servers/${serverName}/cmd?repositoryName=${repositoryName}`,
--- a/src/SASViyaApiClient.ts
+++ b/src/SASViyaApiClient.ts
@@ -2,11 +2,14 @@ import {
  isAuthorizeFormRequired,
  parseAndSubmitAuthorizeForm,
  convertToCSV,
-  makeRequest,
+  makeRequest
 } from "./utils";
 import * as NodeFormData from "form-data";
 import * as path from "path";
-import { Job, Session, Context, Folder } from "./types";
+import { Job, Session, Context, Folder, CsrfToken } from "./types";
+import { JobDefinition } from "./types/JobDefinition";
+import { formatDataForRequest } from "./utils/formatDataForRequest";
+import { SessionManager } from "./SessionManager";

 /**
 * A client for interfacing with the SAS Viya REST API
@@ -16,14 +19,21 @@ export class SASViyaApiClient {
  constructor(
    private serverUrl: string,
    private rootFolderName: string,
+    private contextName: string,
+    private setCsrfToken: (csrfToken: CsrfToken) => void,
    private rootFolderMap = new Map<string, Job[]>()
  ) {
    if (!rootFolderName) {
      throw new Error("Root folder must be provided.");
    }
  }
-  private csrfToken: { headerName: string; value: string } | null = null;
+  private csrfToken: CsrfToken | null = null;
  private rootFolder: Folder | null = null;
+  private sessionManager = new SessionManager(
+    this.serverUrl,
+    this.contextName,
+    this.setCsrfToken
+  );

  /**
   * Returns a map containing the directory structure in the currently set root folder.
@@ -32,7 +42,7 @@ export class SASViyaApiClient {
    if (this.rootFolderMap.size) {
      return this.rootFolderMap;
    }
-    
+
    this.populateRootFolderMap();
    return this.rootFolderMap;
  }
@@ -43,7 +53,7 @@ export class SASViyaApiClient {
  public getConfig() {
    return {
      serverUrl: this.serverUrl,
-      rootFolderName: this.rootFolderName,
+      rootFolderName: this.rootFolderName
    };
  }

@@ -63,12 +73,12 @@ export class SASViyaApiClient {
   */
  public async getAllContexts(accessToken?: string) {
    const headers: any = {
-      "Content-Type": "application/json",
+      "Content-Type": "application/json"
    };
    if (accessToken) {
      headers.Authorization = `Bearer ${accessToken}`;
    }
-    const contexts = await this.request<{ items: Context[] }>(
+    const { result: contexts } = await this.request<{ items: Context[] }>(
      `${this.serverUrl}/compute/contexts`,
      { headers }
    );
@@ -78,7 +88,7 @@ export class SASViyaApiClient {
      id: context.id,
      name: context.name,
      version: context.version,
-      attributes: {},
+      attributes: {}
    }));
  }

@@ -88,12 +98,13 @@ export class SASViyaApiClient {
   */
  public async getExecutableContexts(accessToken?: string) {
    const headers: any = {
-      "Content-Type": "application/json",
+      "Content-Type": "application/json"
    };
    if (accessToken) {
      headers.Authorization = `Bearer ${accessToken}`;
    }
-    const contexts = await this.request<{ items: Context[] }>(
+
+    const { result: contexts } = await this.request<{ items: Context[] }>(
      `${this.serverUrl}/compute/contexts`,
      { headers }
    );
@@ -106,9 +117,7 @@ export class SASViyaApiClient {
        `test-${context.name}`,
        linesOfCode,
        context.name,
-        accessToken,
-        undefined,
-        true
+        accessToken
      ).catch(() => null);
    });
    const results = await Promise.all(promises);
@@ -130,8 +139,8 @@ export class SASViyaApiClient {
          name: contextsList[index].name,
          version: contextsList[index].version,
          attributes: {
-            sysUserId,
-          },
+            sysUserId
+          }
        });
      }
    });
@@ -146,14 +155,14 @@ export class SASViyaApiClient {
   */
  public async createSession(contextName: string, accessToken?: string) {
    const headers: any = {
-      "Content-Type": "application/json",
+      "Content-Type": "application/json"
    };

    if (accessToken) {
      headers.Authorization = `Bearer ${accessToken}`;
    }

-    const contexts = await this.request<{ items: Context[] }>(
+    const { result: contexts } = await this.request<{ items: Context[] }>(
      `${this.serverUrl}/compute/contexts`,
      { headers }
    );
@@ -169,10 +178,10 @@ export class SASViyaApiClient {
      method: "POST",
      headers: {
        Authorization: `Bearer ${accessToken}`,
-        "Content-Type": "application/json",
-      },
+        "Content-Type": "application/json"
+      }
    };
-    const createdSession = this.request<Session>(
+    const { result: createdSession } = await this.request<Session>(
      `${this.serverUrl}/compute/contexts/${executionContext.id}/sessions`,
      createSessionRequest
    );
@@ -190,48 +199,69 @@ export class SASViyaApiClient {
   * @param silent - optional flag to turn of logging.
   */
  public async executeScript(
-    fileName: string,
+    jobName: string,
    linesOfCode: string[],
    contextName: string,
    accessToken?: string,
-    sessionId = "",
-    silent = false
-  ) {
-    const headers: any = {
-      "Content-Type": "application/json",
-    };
-    if (accessToken) {
-      headers.Authorization = `Bearer ${accessToken}`;
-    }
-    if (this.csrfToken) {
-      headers[this.csrfToken.headerName] = this.csrfToken.value;
-    }
-    const contexts = await this.request<{ items: Context[] }>(
-      `${this.serverUrl}/compute/contexts`,
-      { headers }
-    );
-    const executionContext =
-      contexts.items && contexts.items.length
-        ? contexts.items.find((c: any) => c.name === contextName)
-        : null;
+    silent = false,
+    data = null,
+    debug = false
+  ): Promise<any> {
+    silent = !debug;
+    try {
+      const headers: any = {
+        "Content-Type": "application/json"
+      };

-    if (executionContext) {
-      // Request new session in context or use the ID passed in
-      let executionSessionId: string;
-      if (sessionId) {
-        executionSessionId = sessionId;
-      } else {
-        const createSessionRequest = {
-          method: "POST",
-          headers,
-        };
-        const createdSession = await this.request<Session>(
-          `${this.serverUrl}/compute/contexts/${executionContext.id}/sessions`,
-          createSessionRequest
-        );
-
-        executionSessionId = createdSession.id;
+      if (accessToken) {
+        headers.Authorization = `Bearer ${accessToken}`;
      }
+
+      let executionSessionId: string;
+      const session = await this.sessionManager.getSession(accessToken);
+      executionSessionId = session!.id;
+
+      const jobArguments: { [key: string]: any } = {
+        _contextName: contextName,
+        _OMITJSONLISTING: true,
+        _OMITJSONLOG: true,
+        _OMITSESSIONRESULTS: true,
+        _OMITTEXTLISTING: true,
+        _OMITTEXTLOG: true
+      };
+
+      if (debug) {
+        jobArguments["_OMITTEXTLOG"] = false;
+        jobArguments["_OMITSESSIONRESULTS"] = false;
+        jobArguments["_DEBUG"] = 131;
+      }
+
+      const fileName = `exec-${
+        jobName.includes("/") ? jobName.split("/")[1] : jobName
+      }`;
+
+      let jobVariables: any = {
+        SYS_JES_JOB_URI: "",
+        _program: this.rootFolderName + "/" + jobName
+      };
+
+      let files: any[] = [];
+
+      if (data) {
+        if (JSON.stringify(data).includes(";")) {
+          files = await this.uploadTables(data, accessToken);
+          jobVariables["_webin_file_count"] = files.length;
+          files.forEach((fileInfo, index) => {
+            jobVariables[
+              `_webin_fileuri${index + 1}`
+            ] = `/files/files/${fileInfo.file.id}`;
+            jobVariables[`_webin_name${index + 1}`] = fileInfo.tableName;
+          });
+        } else {
+          jobVariables = { ...jobVariables, ...formatDataForRequest(data) };
+        }
+      }
+
      // Execute job in session
      const postJobRequest = {
        method: "POST",
@@ -240,12 +270,16 @@ export class SASViyaApiClient {
          name: fileName,
          description: "Powered by SASjs",
          code: linesOfCode,
-        }),
+          variables: jobVariables,
+          arguments: jobArguments
+        })
      };
-      const postedJob = await this.request<Job>(
+
+      const { result: postedJob, etag } = await this.request<Job>(
        `${this.serverUrl}/compute/sessions/${executionSessionId}/jobs`,
        postJobRequest
      );
+
      if (!silent) {
        console.log(`Job has been submitted for ${fileName}`);
        console.log(
@@ -255,33 +289,75 @@ export class SASViyaApiClient {
        );
      }

-      const jobStatus = await this.pollJobState(postedJob, accessToken, silent);
-      const logLink = postedJob.links.find((l: any) => l.rel === "log");
-      if (logLink) {
-        const log = await this.request(
-          `${this.serverUrl}${logLink.href}?limit=100000`,
-          {
-            headers,
-          }
-        );
-
-        return { jobStatus, log };
-      }
-    } else {
-      console.error(
-        `Unable to find execution context ${contextName}.\nPlease check the contextName in the tgtDeployVars and try again.`
+      const jobStatus = await this.pollJobState(
+        postedJob,
+        etag,
+        accessToken,
+        silent
      );
-      console.error("Response from server: ", JSON.stringify(contexts));
+
+      const { result: currentJob } = await this.request<Job>(
+        `${this.serverUrl}/compute/sessions/${executionSessionId}/jobs/${postedJob.id}`,
+        { headers }
+      );
+
+      let jobResult, log;
+
+      const logLink = currentJob.links.find((l) => l.rel === "log");
+
+      if (true && logLink) {
+        log = await this.request<any>(
+          `${this.serverUrl}${logLink.href}/content?limit=10000`,
+          {
+            headers
+          }
+        ).then((res: any) =>
+          res.result.items.map((i: any) => i.line).join("\n")
+        );
+      }
+
+      if (jobStatus === "failed" || jobStatus === "error") {
+        return Promise.reject({ error: currentJob.error, log: log });
+      }
+      const resultLink = `/compute/sessions/${executionSessionId}/filerefs/_webout/content`;
+
+      if (resultLink) {
+        jobResult = await this.request<any>(
+          `${this.serverUrl}${resultLink}`,
+          { headers },
+          "text"
+        ).catch((e) => ({
+          result: JSON.stringify(e)
+        }));
+      }
+
+      await this.sessionManager.clearSession(executionSessionId, accessToken);
+
+      return { result: jobResult?.result, log };
+    } catch (e) {
+      if (e && e.status === 404) {
+        return this.executeScript(
+          jobName,
+          linesOfCode,
+          contextName,
+          accessToken,
+          silent,
+          data,
+          debug
+        );
+      } else {
+        throw e;
+      }
    }
  }

  /**
-   * Creates a folder in the specified location.  Either parentFolderPath or 
-   *   parentFolderUri must be provided.  
+   * Creates a folder in the specified location.  Either parentFolderPath or
+   *   parentFolderUri must be provided.
   * @param folderName - the name of the new folder.
-   * @param parentFolderPath - the full path to the parent folder.  If not 
+   * @param parentFolderPath - the full path to the parent folder.  If not
   *  provided, the parentFolderUri must be provided.
-   * @param parentFolderUri - the URI (eg /folders/folders/UUID) of the parent 
+   * @param parentFolderUri - the URI (eg /folders/folders/UUID) of the parent
   *  folder.  If not provided, the parentFolderPath must be provided.
   */
  public async createFolder(
@@ -296,17 +372,27 @@ export class SASViyaApiClient {

    if (!parentFolderUri && parentFolderPath) {
      parentFolderUri = await this.getFolderUri(parentFolderPath, accessToken);
-      if (!parentFolderUri){
+      if (!parentFolderUri) {
        console.log(`Parent folder is not present: ${parentFolderPath}`);

-        const newParentFolderPath = parentFolderPath.substring(0, parentFolderPath.lastIndexOf("/"));
+        const newParentFolderPath = parentFolderPath.substring(
+          0,
+          parentFolderPath.lastIndexOf("/")
+        );
        const newFolderName = `${parentFolderPath.split("/").pop()}`;
-        if (newParentFolderPath === ""){
+        if (newParentFolderPath === "") {
          throw new Error("Root Folder should have been present on server");
        }
-        console.log(`Creating Parent Folder:\n${newFolderName} in ${newParentFolderPath}`)
-        const parentFolder = await this.createFolder(newFolderName, newParentFolderPath, undefined, accessToken)
-        console.log(`Parent Folder "${newFolderName}" successfully created.`)
+        console.log(
+          `Creating Parent Folder:\n${newFolderName} in ${newParentFolderPath}`
+        );
+        const parentFolder = await this.createFolder(
+          newFolderName,
+          newParentFolderPath,
+          undefined,
+          accessToken
+        );
+        console.log(`Parent Folder "${newFolderName}" successfully created.`);
        parentFolderUri = `/folders/folders/${parentFolder.id}`;
      }
    }
@@ -315,8 +401,8 @@ export class SASViyaApiClient {
      method: "POST",
      body: JSON.stringify({
        name: folderName,
-        type: "folder",
-      }),
+        type: "folder"
+      })
    };

    createFolderRequest.headers = { "Content-Type": "application/json" };
@@ -324,7 +410,7 @@ export class SASViyaApiClient {
      createFolderRequest.headers.Authorization = `Bearer ${accessToken}`;
    }

-    const createFolderResponse = await this.request<Folder>(
+    const { result: createFolderResponse } = await this.request<Folder>(
      `${this.serverUrl}/folders/folders?parentFolderUri=${parentFolderUri}`,
      createFolderRequest
    );
@@ -350,7 +436,9 @@ export class SASViyaApiClient {
    accessToken?: string
  ) {
    if (!parentFolderPath && !parentFolderUri) {
-      throw new Error('Either parentFolderPath or parentFolderUri must be provided');
+      throw new Error(
+        "Either parentFolderPath or parentFolderUri must be provided"
+      );
    }

    if (!parentFolderUri && parentFolderPath) {
@@ -361,26 +449,26 @@ export class SASViyaApiClient {
      method: "POST",
      headers: {
        "Content-Type": "application/vnd.sas.job.definition+json",
-        Accept: "application/vnd.sas.job.definition+json",
+        Accept: "application/vnd.sas.job.definition+json"
      },
      body: JSON.stringify({
        name: jobName,
-        parameters:[
+        parameters: [
          {
-            "name":"_addjesbeginendmacros",
-            "type":"CHARACTER",
-            "defaultValue":"false"
+            name: "_addjesbeginendmacros",
+            type: "CHARACTER",
+            defaultValue: "false"
          }
        ],
        type: "Compute",
-        code,
-      }),
+        code
+      })
    };

    if (accessToken) {
      createJobDefinitionRequest!.headers = {
        ...createJobDefinitionRequest.headers,
-        Authorization: `Bearer ${accessToken}`,
+        Authorization: `Bearer ${accessToken}`
      };
    }

@@ -399,7 +487,7 @@ export class SASViyaApiClient {

    const authCode = await fetch(authUrl, {
      referrerPolicy: "same-origin",
-      credentials: "include",
+      credentials: "include"
    })
      .then((response) => response.text())
      .then(async (response) => {
@@ -455,7 +543,7 @@ export class SASViyaApiClient {
      token = Buffer.from(clientId + ":" + clientSecret).toString("base64");
    }
    const headers = {
-      Authorization: "Basic " + token,
+      Authorization: "Basic " + token
    };

    let formData;
@@ -474,7 +562,7 @@ export class SASViyaApiClient {
      credentials: "include",
      headers,
      body: formData as any,
-      referrerPolicy: "same-origin",
+      referrerPolicy: "same-origin"
    }).then((res) => res.json());

    return authResponse;
@@ -499,7 +587,7 @@ export class SASViyaApiClient {
      token = Buffer.from(clientId + ":" + clientSecret).toString("base64");
    }
    const headers = {
-      Authorization: "Basic " + token,
+      Authorization: "Basic " + token
    };

    let formData;
@@ -518,7 +606,7 @@ export class SASViyaApiClient {
      credentials: "include",
      headers,
      body: formData as any,
-      referrerPolicy: "same-origin",
+      referrerPolicy: "same-origin"
    }).then((res) => res.json());

    return authResponse;
@@ -538,12 +626,90 @@ export class SASViyaApiClient {
    const deleteResponse = await this.request(url, {
      method: "DELETE",
      credentials: "include",
-      headers,
+      headers
    });

    return deleteResponse;
  }

+  /**
+   * Executes a job via the SAS Viya Compute API
+   * @param sasJob - the relative path to the job.
+   * @param contextName - the name of the context where the job is to be executed.
+   * @param debug - sets the _debug flag in the job arguments.
+   * @param data - any data to be passed in as input to the job.
+   * @param accessToken - an optional access token for an authorized user.
+   */
+  public async executeComputeJob(
+    sasJob: string,
+    contextName: string,
+    debug: boolean,
+    data?: any,
+    accessToken?: string
+  ) {
+    if (!this.rootFolder) {
+      await this.populateRootFolder(accessToken);
+    }
+    if (!this.rootFolder) {
+      console.error("Root folder was not found");
+      throw new Error("Root folder was not found");
+    }
+    if (!this.rootFolderMap.size) {
+      await this.populateRootFolderMap(accessToken);
+    }
+    if (!this.rootFolderMap.size) {
+      console.error(
+        `The job ${sasJob} was not found in ${this.rootFolderName}`
+      );
+      throw new Error(
+        `The job ${sasJob} was not found in ${this.rootFolderName}`
+      );
+    }
+
+    const headers: any = { "Content-Type": "application/json" };
+    if (!!accessToken) {
+      headers.Authorization = `Bearer ${accessToken}`;
+    }
+
+    const folderName = sasJob.split("/")[0];
+    const jobName = sasJob.split("/")[1];
+    const jobFolder = this.rootFolderMap.get(folderName);
+    const jobToExecute = jobFolder?.find((item) => item.name === jobName);
+    if (!jobToExecute) {
+      throw new Error("Job was not found.");
+    }
+
+    let code = jobToExecute?.code;
+    if (!code) {
+      const jobDefinitionLink = jobToExecute?.links.find(
+        (l) => l.rel === "getResource"
+      );
+      if (!jobDefinitionLink) {
+        console.error("Job definition URI was not found.");
+        throw new Error("Job definition URI was not found.");
+      }
+      const { result: jobDefinition } = await this.request<JobDefinition>(
+        `${this.serverUrl}${jobDefinitionLink.href}`,
+        headers
+      );
+
+      code = jobDefinition.code;
+
+      // Add code to existing job definition
+      jobToExecute.code = code;
+    }
+    const linesToExecute = code.replace(/\r\n/g, "\n").split("\n");
+    return await this.executeScript(
+      sasJob,
+      linesToExecute,
+      contextName,
+      accessToken,
+      true,
+      data,
+      debug
+    );
+  }
+
  /**
   * Executes a job via the SAS Viya Job Execution API
   * @param sasJob - the relative path to the job.
@@ -579,6 +745,7 @@ export class SASViyaApiClient {
    if (data && Object.keys(data).length) {
      files = await this.uploadTables(data, accessToken);
    }
+
    const jobName = path.basename(sasJob);
    const jobFolder = sasJob.replace(`/${jobName}`, "");
    const allJobsInFolder = this.rootFolderMap.get(jobFolder.replace("/", ""));
@@ -588,14 +755,14 @@ export class SASViyaApiClient {
        (l) => l.rel === "getResource"
      )?.href;
      const requestInfo: any = {
-        method: "GET",
+        method: "GET"
      };
      const headers: any = { "Content-Type": "application/json" };
      if (!!accessToken) {
        headers.Authorization = `Bearer ${accessToken}`;
      }
      requestInfo.headers = headers;
-      const jobDefinition = await this.request<Job>(
+      const { result: jobDefinition } = await this.request<Job>(
        `${this.serverUrl}${jobDefinitionLink}`,
        requestInfo
      );
@@ -608,19 +775,19 @@ export class SASViyaApiClient {
        _OMITJSONLOG: true,
        _OMITSESSIONRESULTS: true,
        _OMITTEXTLISTING: true,
-        _OMITTEXTLOG: true,
+        _OMITTEXTLOG: true
      };

      if (debug) {
-        jobArguments["_omittextlog"] = "false";
-        jobArguments["_omitsessionresults"] = "false";
-        jobArguments["_debug"] = 131;
+        jobArguments["_OMITTEXTLOG"] = "false";
+        jobArguments["_OMITSESSIONRESULTS"] = "false";
+        jobArguments["_DEBUG"] = 131;
      }

      files.forEach((fileInfo, index) => {
        jobArguments[
          `_webin_fileuri${index + 1}`
-        ] = `/files/files/${fileInfo.id}`;
+        ] = `/files/files/${fileInfo.file.id}`;
        jobArguments[`_webin_name${index + 1}`] = fileInfo.tableName;
      });

@@ -631,28 +798,48 @@ export class SASViyaApiClient {
          name: `exec-${jobName}`,
          description: "Powered by SASjs",
          jobDefinition,
-          arguments: jobArguments,
-        }),
+          arguments: jobArguments
+        })
      };
-      const postedJob = await this.request<Job>(
+      const { result: postedJob, etag } = await this.request<Job>(
        `${this.serverUrl}/jobExecution/jobs?_action=wait`,
        postJobRequest
      );
-      const jobStatus = await this.pollJobState(postedJob, accessToken, true);
-      const currentJob = await this.request<Job>(
+      const jobStatus = await this.pollJobState(
+        postedJob,
+        etag,
+        accessToken,
+        true
+      );
+      const { result: currentJob } = await this.request<Job>(
        `${this.serverUrl}/jobExecution/jobs/${postedJob.id}`,
        { headers }
      );
-      const resultLink = currentJob.results["_webout.json"];
-      if (resultLink) {
-        const result = await this.request<any>(
-          `${this.serverUrl}${resultLink}/content`,
-          { headers }
-        );
-        return result;
-      }

-      return postedJob;
+      let jobResult, log;
+      if (jobStatus === "failed") {
+        return Promise.reject(currentJob.error);
+      }
+      const resultLink = currentJob.results["_webout.json"];
+      const logLink = currentJob.links.find((l) => l.rel === "log");
+      if (resultLink) {
+        jobResult = await this.request<any>(
+          `${this.serverUrl}${resultLink}/content`,
+          { headers },
+          "text"
+        );
+      }
+      if (debug && logLink) {
+        log = await this.request<any>(
+          `${this.serverUrl}${logLink.href}/content`,
+          {
+            headers
+          }
+        ).then((res: any) =>
+          res.result.items.map((i: any) => i.line).join("\n")
+        );
+      }
+      return { result: jobResult?.result, log };
    } else {
      throw new Error(
        `The job ${sasJob} was not found at the location ${this.rootFolderName}`
@@ -664,19 +851,19 @@ export class SASViyaApiClient {
    const allItems = new Map<string, Job[]>();
    const url = "/folders/folders/@item?path=" + this.rootFolderName;
    const requestInfo: any = {
-      method: "GET",
+      method: "GET"
    };
    if (accessToken) {
      requestInfo.headers = { Authorization: `Bearer ${accessToken}` };
    }
-    const folder = await this.request<Folder>(
+    const { result: folder } = await this.request<Folder>(
      `${this.serverUrl}${url}`,
      requestInfo
    );
-    if (!folder){
+    if (!folder) {
      throw new Error("Cannot populate RootFolderMap unless rootFolder exists");
    }
-    const members = await this.request<{ items: any[] }>(
+    const { result: members } = await this.request<{ items: any[] }>(
      `${this.serverUrl}/folders/folders/${folder.id}/members`,
      requestInfo
    );
@@ -691,7 +878,7 @@ export class SASViyaApiClient {
          this.rootFolderName +
          "/" +
          member.name;
-        const memberDetail = await this.request<Folder>(
+        const { result: memberDetail } = await this.request<Folder>(
          `${this.serverUrl}${subFolderUrl}`,
          requestInfo
        );
@@ -700,7 +887,7 @@ export class SASViyaApiClient {
          (l: any) => l.rel === "members"
        );

-        const memberContents = await this.request<{ items: any[] }>(
+        const { result: memberContents } = await this.request<{ items: any[] }>(
          `${this.serverUrl}${membersLink!.href}`,
          requestInfo
        );
@@ -716,34 +903,59 @@ export class SASViyaApiClient {
  private async populateRootFolder(accessToken?: string) {
    const url = "/folders/folders/@item?path=" + this.rootFolderName;
    const requestInfo: RequestInit = {
-      method: "GET",
+      method: "GET"
    };
    if (accessToken) {
      requestInfo.headers = { Authorization: `Bearer ${accessToken}` };
    }
+    let error;
    const rootFolder = await this.request<Folder>(
      `${this.serverUrl}${url}`,
      requestInfo
-    ).catch(() => null);
+    );

-    this.rootFolder = rootFolder;
+    this.rootFolder = rootFolder?.result || null;
+    if (error) {
+      throw new Error(JSON.stringify(error));
+    }
  }

  private async pollJobState(
    postedJob: any,
+    etag: string | null,
    accessToken?: string,
    silent = false
  ) {
+    const MAX_POLL_COUNT = 1000;
+    const POLL_INTERVAL = 100;
    let postedJobState = "";
    let pollCount = 0;
    const headers: any = {
      "Content-Type": "application/json",
+      "If-None-Match": etag
    };
    if (accessToken) {
      headers.Authorization = `Bearer ${accessToken}`;
    }
    const stateLink = postedJob.links.find((l: any) => l.rel === "state");
-    return new Promise((resolve, _) => {
+    if (!stateLink) {
+      Promise.reject("Job state link was not found.");
+    }
+
+    const { result: state } = await this.request<string>(
+      `${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
+      {
+        headers
+      },
+      "text"
+    );
+
+    const currentState = state.trim();
+    if (currentState === "completed") {
+      return Promise.resolve(currentState);
+    }
+
+    return new Promise(async (resolve, _) => {
      const interval = setInterval(async () => {
        if (
          postedJobState === "running" ||
@@ -754,10 +966,10 @@ export class SASViyaApiClient {
            if (!silent) {
              console.log("Polling job status... \n");
            }
-            const jobState = await this.request<string>(
-              `${this.serverUrl}${stateLink.href}?wait=30`,
+            const { result: jobState } = await this.request<string>(
+              `${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
              {
-                headers,
+                headers
              },
              "text"
            );
@@ -767,7 +979,7 @@ export class SASViyaApiClient {
              console.log(`Current state: ${postedJobState}\n`);
            }
            pollCount++;
-            if (pollCount >= 100) {
+            if (pollCount >= MAX_POLL_COUNT) {
              resolve(postedJobState);
            }
          }
@@ -775,14 +987,57 @@ export class SASViyaApiClient {
          clearInterval(interval);
          resolve(postedJobState);
        }
-      }, 100);
+      }, POLL_INTERVAL);
+    });
+  }
+
+  private async waitForSession(
+    session: Session,
+    etag: string | null,
+    accessToken?: string,
+    silent = false
+  ) {
+    let sessionState = session.state;
+    let pollCount = 0;
+    const headers: any = {
+      "Content-Type": "application/json",
+      "If-None-Match": etag
+    };
+    if (accessToken) {
+      headers.Authorization = `Bearer ${accessToken}`;
+    }
+    const stateLink = session.links.find((l: any) => l.rel === "state");
+    return new Promise(async (resolve, _) => {
+      if (sessionState === "pending") {
+        if (stateLink) {
+          if (!silent) {
+            console.log("Polling session status... \n");
+          }
+          const { result: state } = await this.request<string>(
+            `${this.serverUrl}${stateLink.href}?wait=30`,
+            {
+              headers
+            },
+            "text"
+          );
+
+          sessionState = state.trim();
+          if (!silent) {
+            console.log(`Current state: ${sessionState}\n`);
+          }
+          pollCount++;
+          resolve(sessionState);
+        }
+      } else {
+        resolve(sessionState);
+      }
    });
  }

  private async uploadTables(data: any, accessToken?: string) {
    const uploadedFiles = [];
    const headers: any = {
-      "Content-Type": "application/json",
+      "Content-Type": "application/json"
    };
    if (accessToken) {
      headers.Authorization = `Bearer ${accessToken}`;
@@ -799,36 +1054,43 @@ export class SASViyaApiClient {
      const createFileRequest = {
        method: "POST",
        body: csv,
-        headers,
+        headers
      };

-      const file = await this.request<any>(
+      const uploadResponse = await this.request<any>(
        `${this.serverUrl}/files/files#rawUpload`,
        createFileRequest
      );

-      uploadedFiles.push({ tableName, file });
+      uploadedFiles.push({ tableName, file: uploadResponse.result });
    }
    return uploadedFiles;
  }

  private async getFolderUri(folderPath: string, accessToken?: string) {
    const url = "/folders/folders/@item?path=" + folderPath;
-      const requestInfo: any = {
-        method: "GET",
-      };
-      if (accessToken) {
-        requestInfo.headers = { Authorization: `Bearer ${accessToken}` };
-      }
-      const folder = await this.request<Folder>(
-        `${this.serverUrl}${url}`,
-        requestInfo
-      );
-      if (!folder)
-        return undefined;
-      return `/folders/folders/${folder.id}`;
+    const requestInfo: any = {
+      method: "GET"
+    };
+    if (accessToken) {
+      requestInfo.headers = { Authorization: `Bearer ${accessToken}` };
+    }
+    const { result: folder } = await this.request<Folder>(
+      `${this.serverUrl}${url}`,
+      requestInfo
+    ).catch((err) => {
+      return { result: null };
+    });
+
+    if (!folder) return undefined;
+    return `/folders/folders/${folder.id}`;
  }

+  setCsrfTokenLocal = (csrfToken: CsrfToken) => {
+    this.csrfToken = csrfToken;
+    this.setCsrfToken(csrfToken);
+  };
+
  private async request<T>(
    url: string,
    options: RequestInit,
@@ -837,13 +1099,13 @@ export class SASViyaApiClient {
    if (this.csrfToken) {
      options.headers = {
        ...options.headers,
-        [this.csrfToken.headerName]: this.csrfToken.value,
+        [this.csrfToken.headerName]: this.csrfToken.value
      };
    }
    return await makeRequest<T>(
      url,
      options,
-      (csrfToken) => (this.csrfToken = csrfToken),
+      this.setCsrfTokenLocal,
      contentType
    );
  }
--- a/src/SASjs.spec.ts
+++ b/src/SASjs.spec.ts
@@ -2,7 +2,7 @@ import SASjs from "./index";

 const adapter = new SASjs();

-it("should parse SAS9 source code", async done => {
+it("should parse SAS9 source code", async (done) => {
  expect(sampleResponse).toBeTruthy();
  const parsedSourceCode = (adapter as any).parseSAS9SourceCode(sampleResponse);
  expect(parsedSourceCode).toBeTruthy();
@@ -16,7 +16,7 @@ it("should parse SAS9 source code", async done => {
  done();
 });

-it("should parse generated code", async done => {
+it("should parse generated code", async (done) => {
  expect(sampleResponse).toBeTruthy();
  const parsedGeneratedCode = (adapter as any).parseGeneratedCode(
    sampleResponse
--- a/src/SASjs.ts
+++ b/src/SASjs.ts
@@ -1,6 +1,13 @@
-import "isomorphic-fetch";
+import { isIEorEdgeOrOldFirefox } from "./utils/isIeOrEdge";
 import * as e6p from "es6-promise";
 (e6p as any).polyfill();
+if (isIEorEdgeOrOldFirefox()) {
+  if (window) {
+    window.fetch = undefined as any; // ensure the polyfill runs
+  }
+}
+// tslint:disable-next-line
+require("isomorphic-fetch");
 import {
  convertToCSV,
  compareTimestamps,
@@ -12,17 +19,21 @@ import {
  isLogInSuccess,
  parseSourceCode,
  parseGeneratedCode,
+  parseWeboutResponse,
  needsRetry,
-  asyncForEach,
+  asyncForEach
 } from "./utils";
 import {
  SASjsConfig,
  SASjsRequest,
  SASjsWaitingRequest,
  ServerType,
+  CsrfToken,
+  UploadFile
 } from "./types";
 import { SASViyaApiClient } from "./SASViyaApiClient";
 import { SAS9ApiClient } from "./SAS9ApiClient";
+import { FileUploader } from "./FileUploader";

 const defaultConfig: SASjsConfig = {
  serverUrl: "",
@@ -32,6 +43,7 @@ const defaultConfig: SASjsConfig = {
  serverType: ServerType.SASViya,
  debug: true,
  contextName: "SAS Job Execution compute context",
+  useComputeApi: false
 };

 const requestRetryLimit = 5;
@@ -41,23 +53,26 @@ const requestRetryLimit = 5;
 *
 */
 export default class SASjs {
-  private sasjsConfig = new SASjsConfig();
+  private sasjsConfig: SASjsConfig = new SASjsConfig();
  private jobsPath: string = "";
  private logoutUrl: string = "";
  private loginUrl: string = "";
-  private _csrf: string | null = null;
-  private _csrfHeader: string | null = null;
-  private retryCount: number = 0;
+  private csrfTokenApi: CsrfToken | null = null;
+  private csrfTokenWeb: CsrfToken | null = null;
+  private retryCountWeb: number = 0;
+  private retryCountComputeApi: number = 0;
+  private retryCountJeseApi: number = 0;
  private sasjsRequests: SASjsRequest[] = [];
  private sasjsWaitingRequests: SASjsWaitingRequest[] = [];
  private userName: string = "";
  private sasViyaApiClient: SASViyaApiClient | null = null;
  private sas9ApiClient: SAS9ApiClient | null = null;
+  private fileUploader: FileUploader | null = null;

  constructor(config?: any) {
    this.sasjsConfig = {
      ...defaultConfig,
-      ...config,
+      ...config
    };

    this.setupConfiguration();
@@ -115,7 +130,6 @@ export default class SASjs {
      linesOfCode,
      contextName,
      accessToken,
-      sessionId,
      silent
    );
  }
@@ -234,11 +248,19 @@ export default class SASjs {
  }

  /**
-   * Returns the _csrf token of the current session.
+   * Returns the _csrf token of the current session for the API approach
   *
   */
-  public getCsrf() {
-    return this._csrf;
+  public getCsrfApi() {
+    return this.csrfTokenApi?.value;
+  }
+
+  /**
+   * Returns the _csrf token of the current session for the WEB approach.
+   *
+   */
+  public getCsrfWeb() {
+    return this.csrfTokenWeb?.value;
  }

  /**
@@ -248,7 +270,7 @@ export default class SASjs {
  public async setSASjsConfig(config: SASjsConfig) {
    this.sasjsConfig = {
      ...this.sasjsConfig,
-      ...config,
+      ...config
    };
    await this.setupConfiguration();
  }
@@ -269,11 +291,11 @@ export default class SASjs {
  public async checkSession() {
    const loginResponse = await fetch(this.loginUrl.replace(".do", ""));
    const responseText = await loginResponse.text();
-    const isLoggedIn = /You have signed in./gm.test(responseText);
+    const isLoggedIn = /<button.+onClick.+logout/gm.test(responseText);

    return Promise.resolve({
      isLoggedIn,
-      userName: this.userName,
+      userName: this.userName
    });
  }

@@ -286,7 +308,7 @@ export default class SASjs {
    const loginParams: any = {
      _service: "default",
      username,
-      password,
+      password
    };

    this.userName = loginParams.username;
@@ -297,7 +319,7 @@ export default class SASjs {

      return Promise.resolve({
        isLoggedIn,
-        userName: this.userName,
+        userName: this.userName
      });
    }

@@ -314,8 +336,8 @@ export default class SASjs {
      referrerPolicy: "same-origin",
      body: loginParamsStr,
      headers: new Headers({
-        "Content-Type": "application/x-www-form-urlencoded",
-      }),
+        "Content-Type": "application/x-www-form-urlencoded"
+      })
    })
      .then((response) => response.text())
      .then(async (responseText) => {
@@ -342,7 +364,7 @@ export default class SASjs {

        return {
          isLoggedIn: loggedIn,
-          userName: this.userName,
+          userName: this.userName
        };
      })
      .catch((e) => Promise.reject(e));
@@ -362,6 +384,28 @@ export default class SASjs {
    });
  }

+  /**
+   * 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 file - Array of files to be uploaded, including File object and file name.
+   * @param params - Request URL paramaters
+   */
+  public uploadFile(sasJob: string, files: UploadFile[], params: any) {
+    const fileUploader =
+      this.fileUploader ||
+      new FileUploader(
+        this.sasjsConfig.appLoc,
+        this.sasjsConfig.serverUrl,
+        this.jobsPath,
+        this.setCsrfTokenWeb,
+        this.csrfTokenWeb
+      );
+
+    return fileUploader.uploadFile(sasJob, files, params);
+  }
+
  /**
   * Makes a request to the SAS Service specified in `SASjob`.  The response
   * object will always contain table names in lowercase, and column names in
@@ -373,8 +417,9 @@ export default class SASjs {
   *  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.  Can be `null` if no inputs required.
-   * @param params - Provide any changes to the config here, for instance to
-   * enable / disable `debug`.
+   * @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 - provide a function here to be called if the
   * user is not logged in (eg to display a login form).  The request will be
   * resubmitted after logon.
@@ -382,7 +427,127 @@ export default class SASjs {
  public async request(
    sasJob: string,
    data: any,
-    params?: any,
+    config: any = {},
+    loginRequiredCallback?: any,
+    accessToken?: string
+  ) {
+    let requestResponse;
+
+    config = {
+      ...this.sasjsConfig,
+      ...config
+    };
+
+    sasJob = sasJob.startsWith("/") ? sasJob.replace("/", "") : sasJob;
+
+    if (config.serverType === ServerType.SASViya && config.contextName) {
+      if (config.useComputeApi) {
+        requestResponse = await this.executeJobViaComputeApi(
+          sasJob,
+          data,
+          config,
+          loginRequiredCallback,
+          accessToken
+        );
+
+        this.retryCountComputeApi = 0;
+      } else {
+        requestResponse = await this.executeJobViaJesApi(
+          sasJob,
+          data,
+          config,
+          loginRequiredCallback,
+          accessToken
+        );
+
+        this.retryCountJeseApi = 0;
+      }
+    } else {
+      requestResponse = await this.executeJobViaWeb(
+        sasJob,
+        data,
+        config,
+        loginRequiredCallback
+      );
+    }
+
+    return requestResponse;
+  }
+
+  /**
+   * Creates the folders and services in the provided JSON on the given location
+   * (appLoc) on the given server (serverUrl).
+   * @param serviceJson - the JSON specifying the folders and services to be created.
+   * @param appLoc - the base folder in which to create the new folders and
+   * services.  If not provided, is taken from SASjsConfig.
+   * @param serverUrl - the server on which to deploy the folders and services.
+   * If not provided, is taken from SASjsConfig.
+   * @param accessToken - an optional access token to be passed in when
+   * using this function from the command line.
+   */
+  public async deployServicePack(
+    serviceJson: any,
+    appLoc?: string,
+    serverUrl?: string,
+    accessToken?: string
+  ) {
+    if (this.sasjsConfig.serverType !== ServerType.SASViya) {
+      throw new Error("This operation is only supported on SAS Viya servers.");
+    }
+
+    let sasApiClient: any = null;
+    if (serverUrl || appLoc) {
+      if (!serverUrl) {
+        serverUrl = this.sasjsConfig.serverUrl;
+      }
+      if (!appLoc) {
+        appLoc = this.sasjsConfig.appLoc;
+      }
+      if (this.sasjsConfig.serverType === ServerType.SASViya) {
+        sasApiClient = new SASViyaApiClient(
+          serverUrl,
+          appLoc,
+          this.sasjsConfig.contextName,
+          this.setCsrfTokenApi
+        );
+      } else if (this.sasjsConfig.serverType === ServerType.SAS9) {
+        sasApiClient = new SAS9ApiClient(serverUrl);
+      }
+    } else {
+      let sasClientConfig: any = null;
+      if (this.sasjsConfig.serverType === ServerType.SASViya) {
+        sasClientConfig = this.sasViyaApiClient!.getConfig();
+      } else if (this.sasjsConfig.serverType === ServerType.SAS9) {
+        sasClientConfig = this.sas9ApiClient!.getConfig();
+      }
+      serverUrl = sasClientConfig.serverUrl;
+      appLoc = sasClientConfig.rootFolderName as string;
+    }
+
+    // members of type 'folder' should be processed first
+    if (serviceJson.members[0].members) {
+      serviceJson.members[0].members.sort((member: { type: string }) =>
+        member.type === "folder" ? -1 : 1
+      );
+    }
+
+    const members =
+      serviceJson.members[0].name === "services"
+        ? serviceJson.members[0].members
+        : serviceJson.members;
+
+    await this.createFoldersAndServices(
+      appLoc,
+      members,
+      accessToken,
+      sasApiClient
+    );
+  }
+
+  private async executeJobViaComputeApi(
+    sasJob: string,
+    data: any,
+    config: any,
    loginRequiredCallback?: any,
    accessToken?: string
  ) {
@@ -390,59 +555,191 @@ export default class SASjs {
      requestPromise: {
        promise: null,
        resolve: null,
-        reject: null,
+        reject: null
      },
      SASjob: sasJob,
-      data,
-      params,
+      data
    };

-    // if (
-    //   this.sasjsConfig.serverType === ServerType.SASViya &&
-    //   this.sasjsConfig.contextName
-    // ) {
-    //   sasjsWaitingRequest.requestPromise.promise = new Promise(
-    //     async (resolve, reject) => {
-    //       const session = await this.checkSession();
+    sasjsWaitingRequest.requestPromise.promise = new Promise(
+      async (resolve, reject) => {
+        this.sasViyaApiClient
+          ?.executeComputeJob(
+            sasJob,
+            config.contextName,
+            config.debug,
+            data,
+            accessToken
+          )
+          .then((response) => {
+            if (!config.debug) {
+              this.appendSasjsRequest(null, sasJob, null);
+            } else {
+              this.appendSasjsRequest(response, sasJob, null);
+            }

-    //       if (!session.isLoggedIn) {
-    //         if (loginRequiredCallback) loginRequiredCallback(true);
-    //         logInRequired = true;
-    //         sasjsWaitingRequest.requestPromise.resolve = resolve;
-    //         sasjsWaitingRequest.requestPromise.reject = reject;
-    //         this.sasjsWaitingRequests.push(sasjsWaitingRequest);
-    //       } else {
-    //         resolve(
-    //           await this.sasViyaApiClient?.executeJob(
-    //             sasJob,
-    //             this.sasjsConfig.contextName,
-    //             this.sasjsConfig.debug,
-    //             data,
-    //             accessToken
-    //           )
-    //         );
-    //       }
-    //     }
-    //   );
-    //   return sasjsWaitingRequest.requestPromise.promise;
-    // } else {
-    const program = this.sasjsConfig.appLoc
-      ? this.sasjsConfig.appLoc.replace(/\/?$/, "/") + sasJob.replace(/^\//, "")
+            let responseJson;
+
+            try {
+              responseJson = JSON.parse(response!.result);
+            } catch {
+              responseJson = JSON.parse(parseWeboutResponse(response!.result));
+            }
+
+            resolve(responseJson);
+          })
+          .catch(async (response) => {
+            let error = response.error || response;
+
+            if (needsRetry(JSON.stringify(error))) {
+              if (this.retryCountComputeApi < requestRetryLimit) {
+                let retryResponse = await this.executeJobViaComputeApi(
+                  sasJob,
+                  data,
+                  config,
+                  loginRequiredCallback,
+                  accessToken
+                );
+
+                this.retryCountComputeApi++;
+
+                resolve(retryResponse);
+              } else {
+                this.retryCountComputeApi = 0;
+                reject({ MESSAGE: "Compute API retry requests limit reached" });
+              }
+            }
+
+            if (error && error.status === 401) {
+              if (loginRequiredCallback) loginRequiredCallback(true);
+              sasjsWaitingRequest.requestPromise.resolve = resolve;
+              sasjsWaitingRequest.requestPromise.reject = reject;
+              sasjsWaitingRequest.config = config;
+              this.sasjsWaitingRequests.push(sasjsWaitingRequest);
+            } else {
+              reject({ MESSAGE: error || "Job execution failed" });
+            }
+
+            this.appendSasjsRequest(response.log, sasJob, null);
+          });
+      }
+    );
+    return sasjsWaitingRequest.requestPromise.promise;
+  }
+
+  private async executeJobViaJesApi(
+    sasJob: string,
+    data: any,
+    config: any,
+    loginRequiredCallback?: any,
+    accessToken?: string
+  ) {
+    const sasjsWaitingRequest: SASjsWaitingRequest = {
+      requestPromise: {
+        promise: null,
+        resolve: null,
+        reject: null
+      },
+      SASjob: sasJob,
+      data
+    };
+
+    sasjsWaitingRequest.requestPromise.promise = new Promise(
+      async (resolve, reject) => {
+        const session = await this.checkSession();
+
+        if (!session.isLoggedIn) {
+          if (loginRequiredCallback) loginRequiredCallback(true);
+          sasjsWaitingRequest.requestPromise.resolve = resolve;
+          sasjsWaitingRequest.requestPromise.reject = reject;
+          sasjsWaitingRequest.config = config;
+          this.sasjsWaitingRequests.push(sasjsWaitingRequest);
+        } else {
+          resolve(
+            await this.sasViyaApiClient
+              ?.executeJob(
+                sasJob,
+                config.contextName,
+                config.debug,
+                data,
+                accessToken
+              )
+              .then((response) => {
+                if (!config.debug) {
+                  this.appendSasjsRequest(null, sasJob, null);
+                } else {
+                  this.appendSasjsRequest(response, sasJob, null);
+                }
+
+                let responseJson;
+
+                try {
+                  responseJson = JSON.parse(response!.result);
+                } catch {
+                  responseJson = JSON.parse(
+                    parseWeboutResponse(response!.result)
+                  );
+                }
+
+                return responseJson;
+              })
+              .catch(async (e) => {
+                if (needsRetry(JSON.stringify(e))) {
+                  if (this.retryCountJeseApi < requestRetryLimit) {
+                    let retryResponse = await this.executeJobViaJesApi(
+                      sasJob,
+                      data,
+                      config,
+                      loginRequiredCallback,
+                      accessToken
+                    );
+
+                    this.retryCountJeseApi++;
+
+                    resolve(retryResponse);
+                  } else {
+                    this.retryCountJeseApi = 0;
+                    reject({ MESSAGE: "Jes API retry requests limit reached" });
+                  }
+                }
+
+                reject({ MESSAGE: (e && e.message) || "Job execution failed" });
+              })
+          );
+        }
+      }
+    );
+    return sasjsWaitingRequest.requestPromise.promise;
+  }
+
+  private async executeJobViaWeb(
+    sasJob: string,
+    data: any,
+    config: any,
+    loginRequiredCallback?: any
+  ) {
+    const sasjsWaitingRequest: SASjsWaitingRequest = {
+      requestPromise: {
+        promise: null,
+        resolve: null,
+        reject: null
+      },
+      SASjob: sasJob,
+      data
+    };
+    const program = config.appLoc
+      ? config.appLoc.replace(/\/?$/, "/") + sasJob.replace(/^\//, "")
      : sasJob;
    const jobUri =
-      this.sasjsConfig.serverType === "SASVIYA"
-        ? await this.getJobUri(sasJob)
-        : "";
-    const apiUrl = `${this.sasjsConfig.serverUrl}${this.jobsPath}/?${
+      config.serverType === "SASVIYA" ? await this.getJobUri(sasJob) : "";
+    const apiUrl = `${config.serverUrl}${this.jobsPath}/?${
      jobUri.length > 0
        ? "__program=" + program + "&_job=" + jobUri
        : "_program=" + program
    }`;

-    const inputParams = params ? params : {};
    const requestParams = {
-      ...inputParams,
-      ...this.getRequestParams(),
+      ...this.getRequestParamsWeb(config)
    };

    const formData = new FormData();
@@ -451,31 +748,28 @@ export default class SASjs {
    let errorMsg = "";

    if (data) {
-      console.log("Input data", data);
      const stringifiedData = JSON.stringify(data);
      if (
-        this.sasjsConfig.serverType === ServerType.SAS9 ||
+        config.serverType === ServerType.SAS9 ||
        stringifiedData.length > 500000 ||
        stringifiedData.includes(";")
      ) {
        // file upload approach
        for (const tableName in data) {
-          console.log("TableName: ", tableName);
          if (isError) {
            return;
          }
          const name = tableName;
          const csv = convertToCSV(data[tableName]);
-          console.log("Converted CSV", csv);
          if (csv === "ERROR: LARGE STRING LENGTH") {
-            console.log("String too long");
            isError = true;
            errorMsg =
              "The max length of a string value in SASjs is 32765 characters.";
          }

-          const file = new Blob([csv], { type: "application/csv" });
-          console.log("File", file);
+          const file = new Blob([csv], {
+            type: "application/csv"
+          });

          formData.append(name, file, `${name}.csv`);
        }
@@ -516,8 +810,6 @@ export default class SASjs {
      }
    }

-    console.log("Form data", formData);
-
    let isRedirected = false;

    sasjsWaitingRequest.requestPromise.promise = new Promise(
@@ -526,14 +818,14 @@ export default class SASjs {
          reject({ MESSAGE: errorMsg });
        }
        const headers: any = {};
-        if (this._csrfHeader && this._csrf) {
-          headers[this._csrfHeader] = this._csrf;
+        if (this.csrfTokenWeb) {
+          headers[this.csrfTokenWeb.headerName] = this.csrfTokenWeb.value;
        }
        fetch(apiUrl, {
          method: "POST",
          body: formData,
          referrerPolicy: "same-origin",
-          headers,
+          headers
        })
          .then(async (response) => {
            if (!response.ok) {
@@ -542,16 +834,15 @@ export default class SASjs {

                if (tokenHeader) {
                  const token = response.headers.get(tokenHeader);
-                  this._csrfHeader = tokenHeader;
-                  this._csrf = token;
+                  this.csrfTokenWeb = {
+                    headerName: tokenHeader,
+                    value: token || ""
+                  };
                }
              }
            }

-            if (
-              response.redirected &&
-              this.sasjsConfig.serverType === ServerType.SAS9
-            ) {
+            if (response.redirected && config.serverType === ServerType.SAS9) {
              isRedirected = true;
            }

@@ -562,43 +853,41 @@ export default class SASjs {
              (needsRetry(responseText) || isRedirected) &&
              !isLogInRequired(responseText)
            ) {
-              if (this.retryCount < requestRetryLimit) {
-                this.retryCount++;
-                this.request(sasJob, data, params).then(
+              if (this.retryCountWeb < requestRetryLimit) {
+                this.retryCountWeb++;
+                this.request(sasJob, data).then(
                  (res: any) => resolve(res),
                  (err: any) => reject(err)
                );
              } else {
-                this.retryCount = 0;
+                this.retryCountWeb = 0;
                reject(responseText);
              }
            } else {
-              this.retryCount = 0;
+              this.retryCountWeb = 0;
              this.parseLogFromResponse(responseText, program);

              if (isLogInRequired(responseText)) {
                if (loginRequiredCallback) loginRequiredCallback(true);
                sasjsWaitingRequest.requestPromise.resolve = resolve;
                sasjsWaitingRequest.requestPromise.reject = reject;
+                sasjsWaitingRequest.config = config;
                this.sasjsWaitingRequests.push(sasjsWaitingRequest);
              } else {
-                if (
-                  this.sasjsConfig.serverType === ServerType.SAS9 &&
-                  this.sasjsConfig.debug
-                ) {
+                if (config.serverType === ServerType.SAS9 && config.debug) {
                  this.updateUsername(responseText);
-                  const jsonResponseText = this.parseSAS9Response(responseText);
+                  const jsonResponseText = parseWeboutResponse(responseText);

                  if (jsonResponseText !== "") {
                    resolve(JSON.parse(jsonResponseText));
                  } else {
                    reject({
-                      MESSAGE: this.parseSAS9ErrorResponse(responseText),
+                      MESSAGE: this.parseSAS9ErrorResponse(responseText)
                    });
                  }
                } else if (
-                  this.sasjsConfig.serverType === ServerType.SASViya &&
-                  this.sasjsConfig.debug
+                  config.serverType === ServerType.SASViya &&
+                  config.debug
                ) {
                  try {
                    this.parseSASVIYADebugResponse(responseText).then(
@@ -636,72 +925,19 @@ export default class SASjs {
    );

    return sasjsWaitingRequest.requestPromise.promise;
-    // }
  }

-  /**
-   * Creates the folders and services in the provided JSON on the given location
-   * (appLoc) on the given server (serverUrl).
-   * @param serviceJson - the JSON specifying the folders and services to be created.
-   * @param appLoc - the base folder in which to create the new folders and
-   * services.  If not provided, is taken from SASjsConfig.
-   * @param serverUrl - the server on which to deploy the folders and services.
-   * If not provided, is taken from SASjsConfig.
-   * @param accessToken - an optional access token to be passed in when
-   * using this function from the command line.
-   */
-  public async deployServicePack(
-    serviceJson: any,
-    appLoc?: string,
-    serverUrl?: string,
-    accessToken?: string
-  ) {
-    if (this.sasjsConfig.serverType !== ServerType.SASViya) {
-      throw new Error("This operation is only supported on SAS Viya servers.");
-    }
+  private setCsrfTokenWeb = (csrfToken: CsrfToken) => {
+    this.csrfTokenWeb = csrfToken;
+  };

-    let sasApiClient: any = null;
-    if (serverUrl || appLoc) {
-      if (!serverUrl) {
-        serverUrl = this.sasjsConfig.serverUrl;
-      }
-      if (!appLoc) {
-        appLoc = this.sasjsConfig.appLoc;
-      }
-      if (this.sasjsConfig.serverType === ServerType.SASViya) {
-        sasApiClient = new SASViyaApiClient(serverUrl, appLoc);
-      } else if (this.sasjsConfig.serverType === ServerType.SAS9) {
-        sasApiClient = new SAS9ApiClient(serverUrl);
-      }
-    } else {
-      let sasClientConfig: any = null;
-      if (this.sasjsConfig.serverType === ServerType.SASViya) {
-        sasClientConfig = this.sasViyaApiClient!.getConfig();
-      } else if (this.sasjsConfig.serverType === ServerType.SAS9) {
-        sasClientConfig = this.sas9ApiClient!.getConfig();
-      }
-      serverUrl = sasClientConfig.serverUrl;
-      appLoc = sasClientConfig.rootFolderName as string;
-    }
-    const members =
-      serviceJson.members[0].name === "services"
-        ? serviceJson.members[0].members
-        : serviceJson.members;
-    await this.createFoldersAndServices(
-      appLoc,
-      members,
-      accessToken,
-      sasApiClient
-    );
-  }
+  private setCsrfTokenApi = (csrfToken: CsrfToken) => {
+    this.csrfTokenApi = csrfToken;
+  };

  private async resendWaitingRequests() {
    for (const sasjsWaitingRequest of this.sasjsWaitingRequests) {
-      this.request(
-        sasjsWaitingRequest.SASjob,
-        sasjsWaitingRequest.data,
-        sasjsWaitingRequest.params
-      ).then(
+      this.request(sasjsWaitingRequest.SASjob, sasjsWaitingRequest.data).then(
        (res: any) => {
          sasjsWaitingRequest.requestPromise.resolve(res);
        },
@@ -714,14 +950,14 @@ export default class SASjs {
    this.sasjsWaitingRequests = [];
  }

-  private getRequestParams(): any {
+  private getRequestParamsWeb(config: any): any {
    const requestParams: any = {};

-    if (this._csrf) {
-      requestParams["_csrf"] = this._csrf;
+    if (this.csrfTokenWeb) {
+      requestParams["_csrf"] = this.csrfTokenWeb.value;
    }

-    if (this.sasjsConfig.debug) {
+    if (config.debug) {
      requestParams["_omittextlog"] = "false";
      requestParams["_omitsessionresults"] = "false";

@@ -785,23 +1021,6 @@ export default class SASjs {
    return uri;
  }

-  private parseSAS9Response(response: string) {
-    let sas9Response = "";
-
-    if (response.includes(">>weboutBEGIN<<")) {
-      try {
-        sas9Response = response
-          .split(">>weboutBEGIN<<")[1]
-          .split(">>weboutEND<<")[0];
-      } catch (e) {
-        sas9Response = "";
-        console.error(e);
-      }
-    }
-
-    return sas9Response;
-  }
-
  private parseSAS9ErrorResponse(response: string) {
    const logLines = response.split("\n");
    const parsedLines: string[] = [];
@@ -839,7 +1058,7 @@ export default class SASjs {
  private fetchLogFileContent(logLink: string) {
    return new Promise((resolve, reject) => {
      fetch(logLink, {
-        method: "GET",
+        method: "GET"
      })
        .then((response: any) => response.text())
        .then((response: any) => resolve(response))
@@ -856,19 +1075,34 @@ export default class SASjs {
    let generatedCode = "";
    let sasWork = null;

-    if (response) {
-      sourceCode = parseSourceCode(response);
-      generatedCode = parseGeneratedCode(response);
-      sasWork = await this.parseSasWork(response);
+    if (response && response.result && response.log) {
+      sourceCode = parseSourceCode(response.log);
+      generatedCode = parseGeneratedCode(response.log);
+
+      if (this.sasjsConfig.debug) {
+        if (response.log) {
+          sasWork = response.log;
+        } else {
+          sasWork = JSON.parse(parseWeboutResponse(response.result)).WORK;
+        }
+      } else {
+        sasWork = JSON.parse(response.result).WORK;
+      }
+    } else {
+      if (response) {
+        sourceCode = parseSourceCode(response);
+        generatedCode = parseGeneratedCode(response);
+        sasWork = await this.parseSasWork(response);
+      }
    }

    this.sasjsRequests.push({
-      logFile: response,
+      logFile: (response && response.log) || response,
      serviceLink: program,
      timestamp: new Date(),
      sourceCode,
      generatedCode,
-      SASWORK: sasWork,
+      SASWORK: sasWork
    });

    if (this.sasjsRequests.length > 20) {
@@ -882,9 +1116,9 @@ export default class SASjs {

      if (this.sasjsConfig.serverType === ServerType.SAS9) {
        try {
-          jsonResponse = JSON.parse(this.parseSAS9Response(response));
+          jsonResponse = JSON.parse(parseWeboutResponse(response));
        } catch (e) {
-          console.log(e);
+          console.error(e);
        }
      } else {
        await this.parseSASVIYADebugResponse(response).then(
@@ -892,11 +1126,11 @@ export default class SASjs {
            try {
              jsonResponse = JSON.parse(resText);
            } catch (e) {
-              console.log(e);
+              console.error(e);
            }
          },
          (err: any) => {
-            console.log(err);
+            console.error(err);
          }
        );
      }
@@ -913,6 +1147,10 @@ export default class SASjs {
    return sortedRequests;
  }

+  public clearSasRequests() {
+    this.sasjsRequests = [];
+  }
+
  private setupConfiguration() {
    if (
      this.sasjsConfig.serverUrl === undefined ||
@@ -948,7 +1186,9 @@ export default class SASjs {
      else
        this.sasViyaApiClient = new SASViyaApiClient(
          this.sasjsConfig.serverUrl,
-          this.sasjsConfig.appLoc
+          this.sasjsConfig.appLoc,
+          this.sasjsConfig.contextName,
+          this.setCsrfTokenApi
        );
    }
    if (this.sasjsConfig.serverType === ServerType.SAS9) {
@@ -956,6 +1196,13 @@ export default class SASjs {
        this.sas9ApiClient!.setConfig(this.sasjsConfig.serverUrl);
      else this.sas9ApiClient = new SAS9ApiClient(this.sasjsConfig.serverUrl);
    }
+
+    this.fileUploader = new FileUploader(
+      this.sasjsConfig.appLoc,
+      this.sasjsConfig.serverUrl,
+      this.jobsPath,
+      this.setCsrfTokenWeb
+    );
  }

  private setLoginUrl = (matches: RegExpExecArray) => {
--- a/src/SessionManager.ts
+++ b/src/SessionManager.ts
@@ -0,0 +1,170 @@
+import { Session, Context, CsrfToken } from "./types";
+import { asyncForEach, makeRequest } from "./utils";
+
+const MAX_SESSION_COUNT = 1;
+
+export class SessionManager {
+  constructor(
+    private serverUrl: string,
+    private contextName: string,
+    private setCsrfToken: (csrfToken: CsrfToken) => void
+  ) {}
+  private sessions: Session[] = [];
+  private currentContext: Context | null = null;
+  private csrfToken: CsrfToken | null = null;
+
+  async getSession(accessToken?: string) {
+    await this.createSessions(accessToken);
+    this.createAndWaitForSession(accessToken);
+    const session = this.sessions.pop();
+    const secondsSinceSessionCreation =
+      (new Date().getTime() - new Date(session!.creationTimeStamp).getTime()) /
+      1000;
+    if (
+      secondsSinceSessionCreation >= session!.attributes.sessionInactiveTimeout
+    ) {
+      await this.createSessions(accessToken);
+      const freshSession = this.sessions.pop();
+      return freshSession;
+    }
+    return session;
+  }
+
+  async clearSession(id: string, accessToken?: string) {
+    const deleteSessionRequest = {
+      method: "DELETE",
+      headers: this.getHeaders(accessToken)
+    };
+    return await this.request<Session>(
+      `${this.serverUrl}/compute/sessions/${id}`,
+      deleteSessionRequest
+    ).then(() => {
+      this.sessions = this.sessions.filter((s) => s.id !== id);
+    });
+  }
+
+  private async createSessions(accessToken?: string) {
+    if (!this.sessions.length) {
+      if (!this.currentContext) {
+        await this.setCurrentContext(accessToken);
+      }
+      await asyncForEach(new Array(MAX_SESSION_COUNT), async () => {
+        const createdSession = await this.createAndWaitForSession(accessToken);
+        this.sessions.push(createdSession);
+      });
+    }
+  }
+
+  private async createAndWaitForSession(accessToken?: string) {
+    const createSessionRequest = {
+      method: "POST",
+      headers: this.getHeaders(accessToken)
+    };
+    const { result: createdSession, etag } = await this.request<Session>(
+      `${this.serverUrl}/compute/contexts/${this.currentContext!.id}/sessions`,
+      createSessionRequest
+    );
+
+    await this.waitForSession(createdSession, etag);
+    this.sessions.push(createdSession);
+    return createdSession;
+  }
+
+  private async setCurrentContext(accessToken?: string) {
+    if (!this.currentContext) {
+      const { result: contexts } = await this.request<{
+        items: Context[];
+      }>(`${this.serverUrl}/compute/contexts`, {
+        headers: this.getHeaders(accessToken)
+      });
+
+      const contextsList =
+        contexts && contexts.items && contexts.items.length
+          ? contexts.items
+          : [];
+
+      const currentContext = contextsList.find(
+        (c: any) => c.name === this.contextName
+      );
+
+      if (!currentContext) {
+        throw new Error(
+          `The context ${this.contextName} was not found on the server ${this.serverUrl}`
+        );
+      }
+
+      this.currentContext = currentContext;
+    }
+  }
+
+  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,
+    accessToken?: string,
+    silent = false
+  ) {
+    let sessionState = session.state;
+    const headers: any = {
+      ...this.getHeaders(accessToken),
+      "If-None-Match": etag
+    };
+    const stateLink = session.links.find((l: any) => l.rel === "state");
+    return new Promise(async (resolve, _) => {
+      if (sessionState === "pending") {
+        if (stateLink) {
+          if (!silent) {
+            console.log("Polling session status... \n");
+          }
+          const { result: state } = await this.request<string>(
+            `${this.serverUrl}${stateLink.href}?wait=30`,
+            {
+              headers
+            },
+            "text"
+          );
+
+          sessionState = state.trim();
+          if (!silent) {
+            console.log(`Current state: ${sessionState}\n`);
+          }
+          resolve(sessionState);
+        }
+      } else {
+        resolve(sessionState);
+      }
+    });
+  }
+
+  private async request<T>(
+    url: string,
+    options: RequestInit,
+    contentType: "text" | "json" = "json"
+  ) {
+    if (this.csrfToken) {
+      options.headers = {
+        ...options.headers,
+        [this.csrfToken.headerName]: this.csrfToken.value
+      };
+    }
+    return await makeRequest<T>(
+      url,
+      options,
+      (token) => {
+        this.csrfToken = token;
+        this.setCsrfToken(token);
+      },
+      contentType
+    );
+  }
+}
--- a/src/types/Job.ts
+++ b/src/types/Job.ts
@@ -6,6 +6,8 @@ export interface Job {
  name: string;
  uri: string;
  createdBy: string;
+  code?: string;
  links: Link[];
  results: JobResult;
+  error?: any;
 }
--- a/src/types/JobDefinition.ts
+++ b/src/types/JobDefinition.ts
@@ -0,0 +1,3 @@
+export interface JobDefinition {
+  code: string;
+}
--- a/src/types/SASjsConfig.ts
+++ b/src/types/SASjsConfig.ts
@@ -27,4 +27,5 @@ export class SASjsConfig {
   */
  debug: boolean = true;
  contextName: string = "";
+  useComputeApi = false;
 }
--- a/src/types/SASjsWaitingRequest.ts
+++ b/src/types/SASjsWaitingRequest.ts
@@ -10,5 +10,5 @@ export interface SASjsWaitingRequest {
  };
  SASjob: string;
  data: any;
-  params?: any;
+  config?: any;
 }
--- a/src/types/ServerType.ts
+++ b/src/types/ServerType.ts
@@ -4,5 +4,5 @@
 */
 export enum ServerType {
  SASViya = "SASVIYA",
-  SAS9 = "SAS9",
+  SAS9 = "SAS9"
 }
--- a/src/types/Session.ts
+++ b/src/types/Session.ts
@@ -1,3 +1,11 @@
+import { Link } from "./Link";
+
 export interface Session {
  id: string;
+  state: string;
+  links: Link[];
+  attributes: {
+    sessionInactiveTimeout: number;
+  };
+  creationTimeStamp: string;
 }
--- a/src/types/UploadFile.ts
+++ b/src/types/UploadFile.ts
@@ -0,0 +1,8 @@
+/**
+ * Represents a object that is passed to file uploader
+ *
+ */
+export interface UploadFile {
+  file: File;
+  fileName: string;
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Krishna Acondy	619833db29	Merge pull request #56 from sasjs/performance-improvements fix(*): Performance improvements	2020-09-01 11:49:34 +01:00
Krishna Acondy	a587d9f6de	chore(ci): add lint action	2020-09-01 11:20:46 +01:00
Krishna Acondy	83fb89f779	fix(*): cache job definition code after first fetch, make initial state request before poll	2020-09-01 11:13:52 +01:00
Krishna Acondy	6b98bbce7c	chore(types): add code property to Job model	2020-09-01 11:12:56 +01:00
Krishna Acondy	3c2487e423	Merge pull request #49 from sasjs/dependabot/npm_and_yarn/ts-loader-8.0.3 chore(deps-dev): bump ts-loader from 8.0.2 to 8.0.3	2020-08-31 10:23:01 +01:00
dependabot-preview[bot]	0d52af5375	chore(deps-dev): bump ts-loader from 8.0.2 to 8.0.3 Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 8.0.2 to 8.0.3. - [Release notes](https://github.com/TypeStrong/ts-loader/releases) - [Changelog](https://github.com/TypeStrong/ts-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/TypeStrong/ts-loader/compare/v8.0.2...v8.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-08-31 09:04:08 +00:00
Krishna Acondy	d0da343efc	Merge pull request #53 from sasjs/dependabot/npm_and_yarn/prettier-2.1.1 chore(deps-dev): bump prettier from 2.0.5 to 2.1.1	2020-08-31 09:58:58 +01:00
dependabot-preview[bot]	54f401a319	chore(deps-dev): bump prettier from 2.0.5 to 2.1.1 Bumps [prettier](https://github.com/prettier/prettier) from 2.0.5 to 2.1.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.0.5...2.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-08-31 08:24:44 +00:00
Krishna Acondy	5efcb11b7d	chore(*): add lint fix command	2020-08-31 09:22:21 +01:00
Krishna Acondy	929d7b993b	chore(*): add .prettierrc, fix formatting	2020-08-31 09:15:02 +01:00
Allan Bowe	688221c042	Update example.html	2020-08-28 20:11:04 +02:00
Allan Bowe	57d0b30f47	Merge pull request #52 from sasjs/deploy-issue fix: members of type folder should be processed first on service pack deploy.	2020-08-28 20:00:43 +02:00
Yury Shkoda	0d5af2487d	fix: members of type folder should be proccessed first on service pack deploy	2020-08-28 15:30:53 +03:00
Yury Shkoda	1ea163fd03	fix: members of type folder should be proccessed first on service pack deploy	2020-08-28 14:31:35 +03:00
Allan Bowe	f27444bc52	Merge pull request #48 from sasjs/issue47 fix: login not working on non english browsers	2020-08-23 18:24:36 +02:00
Mihajlo Medjedovic	de426c9a92	fix: login not working on non english browsers	2020-08-23 18:17:35 +02:00
Allan Bowe	a006ead205	Merge pull request #46 from sasjs/issue45 fix: jobViaWeb config override	2020-08-23 17:07:47 +02:00
Mihajlo Medjedovic	422c2a1fd5	fix: jobViaWeb config override	2020-08-23 17:04:39 +02:00
Krishna Acondy	0c6409e402	Merge pull request #44 from sasjs/session-expiry-retry fix(session-expiry-retry): retry job with new session on expiry	2020-08-18 21:45:47 +01:00
Krishna Acondy	68b864cf75	fix(session-expiry): discard and create new session if expired	2020-08-18 21:35:02 +01:00
Krishna Acondy	75a11cdff4	fix(session-expiry-retry): retry job with new session when current session has expired	2020-08-18 20:23:59 +01:00
Allan Bowe	4e2b6d32cc	Merge pull request #43 from sasjs/parse-compute-log fix(log): use compute log directly when available	2020-08-18 18:21:56 +02:00
Krishna Acondy	cd9757b383	Merge branch 'master' into parse-compute-log	2020-08-18 17:01:33 +01:00
Mihajlo Medjedovic	fb727788d0	fix: log capture if job fails, test framework update, added test for log capture	2020-08-18 17:36:25 +02:00
Allan Bowe	35eb6c4935	Merge pull request #40 from sasjs/dependabot/npm_and_yarn/types/jest-26.0.10 chore(deps-dev): bump @types/jest from 26.0.9 to 26.0.10	2020-08-18 13:26:57 +02:00
Mihajlo Medjedovic	ea0f338b90	Merge branch 'master' into parse-compute-log	2020-08-18 13:26:16 +02:00
Allan Bowe	b6a17b39b9	Merge branch 'master' into dependabot/npm_and_yarn/types/jest-26.0.10	2020-08-18 13:25:28 +02:00
Allan Bowe	9ed64e5a2c	Merge pull request #42 from sasjs/issue41 fix: csrfTokenWeb setter callback	2020-08-18 13:22:33 +02:00
Mihajlo Medjedovic	0479a5d651	fix: csrfTokenWeb setter callback	2020-08-18 13:17:29 +02:00
Allan Bowe	005f10bb47	Update CONTRIBUTING.md	2020-08-18 11:24:30 +02:00
Krishna Acondy	98c9cb78ff	fix(log): use compute log as-is when available	2020-08-18 10:05:34 +01:00
Krishna Acondy	8192f69f67	fix(*): do not use polyfill when running on Node.js	2020-08-18 08:25:40 +01:00
dependabot-preview[bot]	c28a8ebf15	chore(deps-dev): bump @types/jest from 26.0.9 to 26.0.10 Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 26.0.9 to 26.0.10. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-08-17 13:19:21 +00:00
Krishna Acondy	a409d8cdb6	Merge pull request #38 from sasjs/brwoserCheckFix fix: isIEorEdgeOrOldFirefox error	2020-08-14 13:10:44 +01:00
Mihajlo Medjedovic	618a20eaba	fix: isIEorEdgeOrOldFirefox error	2020-08-14 14:09:28 +02:00
Krishna Acondy	c9b1273c31	Merge pull request #37 from sasjs/ie-edge-fetch fix(*): use fetch polyfill in IE, Edge and Firefox <60	2020-08-13 21:56:11 +01:00
Krishna Acondy	59674744be	fix(*): use fetch polyfill for Firefox versions older than 60	2020-08-13 21:46:08 +01:00
Krishna Acondy	870cc0055b	fix(*): use fetch polyfill in Firefox 60	2020-08-13 21:07:21 +01:00
Krishna Acondy	0ffa62fab4	fix(*): use fetch polyfill in IE and Edge	2020-08-13 20:53:27 +01:00
Allan Bowe	b4c7868fb6	Merge pull request #36 from sasjs/issue34 fix: job definition debug log parse	2020-08-11 18:44:39 +02:00
Mihajlo Medjedovic	2266578013	Merge branch 'master' into issue34	2020-08-11 18:29:41 +02:00
Mihajlo Medjedovic	f2ebe1a5b0	fix: job definition debug log parse	2020-08-10 18:13:11 +02:00
Allan Bowe	6a52bbe560	Merge pull request #35 from sasjs/issue33 fix: makeRequest inconsistent response structure	2020-08-10 17:19:05 +02:00
Mihajlo Medjedovic	a5c725e677	fix: makeRequest incositent response structure	2020-08-10 17:05:10 +02:00
Krishna Acondy	f5e1907e28	feat(clear-requests): add function to clear debug requests	2020-08-08 14:27:40 +01:00
Krishna Acondy	f7a9b0cbb6	fix(compute-api): ignore 404s when requesting webout content	2020-08-08 14:26:09 +01:00
Krishna Acondy	1258a1a180	fix(login-callback): fix request failure when login is required	2020-08-08 12:56:31 +01:00
Krishna Acondy	0bb343a1de	chore(deps): bump adapter and test framework	2020-08-08 11:42:16 +01:00
Krishna Acondy	929c89b70f	Merge pull request #32 from sasjs/dependabot/npm_and_yarn/types/jest-26.0.9 chore(deps-dev): bump @types/jest from 26.0.8 to 26.0.9	2020-08-08 11:04:25 +01:00
dependabot-preview[bot]	169ca35238	chore(deps-dev): bump @types/jest from 26.0.8 to 26.0.9 Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 26.0.8 to 26.0.9. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-08-06 12:59:52 +00:00
Allan Bowe	60be28f149	Merge pull request #31 from sasjs/session-cleanup feat(session-cleanup): delete a session after it has been used	2020-08-05 23:17:42 +02:00
Krishna Acondy	14daa55184	feat(session-cleanup): delete a session after it has been used	2020-08-05 21:52:23 +01:00
Krishna Acondy	f763f05b5e	Merge pull request #30 from sasjs/deployFix fix: makeRequest retry	2020-08-05 20:02:44 +01:00
Mihajlo Medjedovic	b6aced5bad	fix: makeRequest retry	2020-08-05 20:58:10 +02:00
Allan Bowe	7bb7db0f27	Merge pull request #24 from sasjs/dependabot/npm_and_yarn/webpack-4.44.1 chore(deps-dev): bump webpack from 4.43.0 to 4.44.1	2020-08-04 20:57:22 +02:00
Allan Bowe	36ea148446	Merge branch 'master' into dependabot/npm_and_yarn/webpack-4.44.1	2020-08-04 20:56:51 +02:00
Allan Bowe	762254d8c4	Merge pull request #29 from sasjs/deployFixing fix: makeRequest retry, getFolderUri error catching	2020-08-04 20:56:20 +02:00
Mihajlo Medjedovic	8474b222ea	fix: makeRequest retry, getFolderUri error catching	2020-08-04 20:39:09 +02:00
dependabot-preview[bot]	c1750c014e	chore(deps-dev): bump webpack from 4.43.0 to 4.44.1 Bumps [webpack](https://github.com/webpack/webpack) from 4.43.0 to 4.44.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.43.0...v4.44.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-08-03 20:41:21 +00:00
Krishna Acondy	d7a7909529	Merge pull request #26 from sasjs/dependabot/npm_and_yarn/tslint-6.1.3 chore(deps-dev): bump tslint from 6.1.2 to 6.1.3	2020-08-03 21:39:07 +01:00
dependabot-preview[bot]	31b60a985e	chore(deps-dev): bump tslint from 6.1.2 to 6.1.3 Bumps [tslint](https://github.com/palantir/tslint) from 6.1.2 to 6.1.3. - [Release notes](https://github.com/palantir/tslint/releases) - [Changelog](https://github.com/palantir/tslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/palantir/tslint/compare/6.1.2...6.1.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-08-03 20:38:05 +00:00
Krishna Acondy	a6b13d9cb9	Merge pull request #27 from sasjs/dependabot/npm_and_yarn/types/jest-26.0.8 chore(deps-dev): bump @types/jest from 26.0.5 to 26.0.8	2020-08-03 21:35:56 +01:00
dependabot-preview[bot]	55fcbf2e36	chore(deps-dev): bump @types/jest from 26.0.5 to 26.0.8 Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 26.0.5 to 26.0.8. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-08-03 19:34:31 +00:00
Krishna Acondy	fad8549d92	Merge pull request #28 from sasjs/dependabot/npm_and_yarn/ts-loader-8.0.2 chore(deps-dev): bump ts-loader from 8.0.1 to 8.0.2	2020-08-03 20:32:10 +01:00
dependabot-preview[bot]	95c03e5d07	chore(deps-dev): bump ts-loader from 8.0.1 to 8.0.2 Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 8.0.1 to 8.0.2. - [Release notes](https://github.com/TypeStrong/ts-loader/releases) - [Changelog](https://github.com/TypeStrong/ts-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/TypeStrong/ts-loader/compare/v8.0.1...v8.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-08-03 18:57:46 +00:00
Krishna Acondy	e241a47c23	Merge pull request #11 from sasjs/api-execution feat(*): Job Execution Approaches	2020-08-03 19:52:59 +01:00
Krishna Acondy	ed7f36dbed	Merge branch 'api-execution' of https://github.com/sasjs/adapter into api-execution	2020-08-03 19:51:21 +01:00
Krishna Acondy	74f0c263db	Merge branch 'master' of https://github.com/sasjs/adapter into api-execution	2020-08-03 19:50:30 +01:00
Krishna Acondy	5a2a4bf39c	Merge pull request #19 from sasjs/issue17 File upload function and separate WEB and API csrf tokens	2020-08-01 19:10:29 +01:00
Mihajlo Medjedovic	0ea91ddd3b	Merge branch 'api-execution' into issue17	2020-07-31 19:08:39 +02:00
Mihajlo Medjedovic	4422c37827	fix: retry requests with API approach	2020-07-30 00:43:12 +02:00
Krishna Acondy	5fad9d01bc	chore(sasjs-tests): remove unnecessary code, bump test framework version	2020-07-29 22:52:17 +01:00
Mihajlo Medjedovic	fb02c77a3a	fix: login required callback	2020-07-29 13:20:03 +02:00
Mihajlo Medjedovic	5de84c07a8	fix: computeApi approach loginRequired callback	2020-07-29 12:33:18 +02:00
Mihajlo Medjedovic	54e2319183	fix: public upload file params	2020-07-28 14:10:46 +02:00
Mihajlo Medjedovic	261913d2d7	fix: uploadFile accept multiple files	2020-07-28 13:23:57 +02:00
Allan Bowe	187917cb32	Merge pull request #20 from sasjs/use-test-framework chore(sasjs-tests): use test framework in SASjs Tests	2020-07-23 10:15:12 +02:00
Allan Bowe	d22b6c77b3	Merge branch 'master' into use-test-framework	2020-07-23 10:14:30 +02:00
Allan Bowe	785b276741	chore: doc update	2020-07-22 23:34:41 +02:00
Krishna Acondy	2ce3669b10	Merge branch 'api-execution' of https://github.com/sasjs/adapter into issue17	2020-07-22 20:00:19 +01:00
Krishna Acondy	3a1ea1614f	Merge branch 'master' of https://github.com/sasjs/adapter into issue17	2020-07-22 19:57:10 +01:00
Krishna Acondy	3c5988aacf	chore(sasjs-tests): add missing dependency	2020-07-22 19:55:14 +01:00
Krishna Acondy	1a25c354fa	Merge pull request #13 from sasjs/requestConfigOverride Request config override	2020-07-22 19:53:33 +01:00
Krishna Acondy	eb1668d6c1	Merge pull request #15 from sasjs/dependabot/npm_and_yarn/types/jest-26.0.5 chore(deps-dev): bump @types/jest from 26.0.4 to 26.0.5	2020-07-22 19:46:32 +01:00
Krishna Acondy	69d088a9c6	chore(sasjs-tests): use test framework in SASjs Tests	2020-07-22 19:42:34 +01:00
Krishna Acondy	ccd44c31c7	feat(file-upload): move functionality into FileUploader	2020-07-22 07:14:31 +01:00
Krishna Acondy	dec7c18ecb	Merge branch 'api-execution' of https://github.com/sasjs/adapter into api-execution	2020-07-22 06:42:53 +01:00
Krishna Acondy	c8a5eb5993	chore(deploy): update script to deploy tests	2020-07-22 06:42:50 +01:00
Mihajlo Medjedovic	700a67a600	feat: file upload function, WEB and API csrf tokens	2020-07-21 22:35:43 +02:00
Mihajlo Medjedovic	a2778bed52	docs: request() update	2020-07-20 23:03:05 +02:00
Mihajlo Medjedovic	2b04fe0c3e	docs: update	2020-07-20 21:31:54 +02:00
Mihajlo Medjedovic	1c1e6b8efd	fix: waiting requests passing config	2020-07-20 20:44:30 +02:00
Mihajlo Medjedovic	c92a0a53f2	Merge pull request #16 from sasjs/csrfTokenGetter feat: csrf token main file sync	2020-07-20 20:35:43 +02:00
Mihajlo Medjedovic	ee024c67ab	feat: csrf token main file sync	2020-07-20 20:34:12 +02:00
dependabot-preview[bot]	27301651be	chore(deps-dev): bump @types/jest from 26.0.4 to 26.0.5 Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 26.0.4 to 26.0.5. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-07-20 08:58:58 +00:00
Krishna Acondy	9742f53dde	Merge pull request #12 from sasjs/dependabot/npm_and_yarn/typescript-3.9.7 chore(deps-dev): bump typescript from 3.9.6 to 3.9.7	2020-07-20 08:19:25 +01:00
dependabot-preview[bot]	38a950a036	chore(deps-dev): bump typescript from 3.9.6 to 3.9.7 Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.9.6 to 3.9.7. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v3.9.6...v3.9.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-07-20 07:17:13 +00:00
Allan Bowe	e41c54e37e	docs: adding link attributes due to security vulnerability	2020-07-19 19:57:03 +02:00
Mihajlo Medjedovic	405a19f0cf	fix: local config	2020-07-19 17:44:29 +02:00
Mihajlo Medjedovic	c7d6c66093	feat: request config override	2020-07-19 16:10:56 +02:00
Krishna Acondy	8bf74d17e9	fix(*): handle login required state, fix session creation logic	2020-07-18 15:08:40 +01:00
Krishna Acondy	a12244cf78	feat(session-manager): Manage a pool of sessions for job execution	2020-07-17 08:31:27 +01:00
Krishna Acondy	a579f481c5	fix(context): cache contexts after first request	2020-07-16 17:31:03 +01:00
Krishna Acondy	2ecd57169f	fix(context): cache contexts after first request	2020-07-16 17:27:28 +01:00
Krishna Acondy	7d84033ad4	feat(compute-api): implement job execution via compute API	2020-07-16 09:06:24 +01:00
Allan Bowe	c4109b225b	chore: readme update	2020-07-15 16:00:05 +02:00
Allan Bowe	2ec8696615	chore: readme update	2020-07-15 15:40:58 +02:00
Allan Bowe	c5339276e4	chore: readme update	2020-07-15 15:38:16 +02:00
Allan Bowe	97db960f62	chore: updating example.html to be consistent with README	2020-07-15 13:33:04 +02:00
Krishna Acondy	92504b0c16	feat(jes-api): implement job execution via API to JES	2020-07-13 18:38:30 +01:00