chore(*): add tests for SessionManager

chore(deps-dev): bump terser-webpack-plugin from 4.2.2 to 4.2.3

.github/workflows/build.yml

@@ -27,6 +27,16 @@ jobs:
         run: npm run lint
       - name: Run unit tests
         run: npm test
+        env:
+          CI: true
+          CLIENT: ${{secrets.CLIENT}}
+          SECRET: ${{secrets.SECRET}}
+          SAS_USERNAME: ${{secrets.SAS_USERNAME}}
+          SAS_PASSWORD: ${{secrets.SAS_PASSWORD}}
+          SERVER_URL: ${{secrets.SERVER_URL}}
+          SERVER_TYPE: ${{secrets.SERVER_TYPE}}
+          ACCESS_TOKEN: ${{secrets.ACCESS_TOKEN}}
+          REFRESH_TOKEN: ${{secrets.REFRESH_TOKEN}}
       - name: Build Package
         run: npm run package:lib
         env:

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+## Issue
+
+Link any related issue(s) in this section.
+
+## Intent
+
+What this PR intends to achieve.
+
+## Implementation
+
+What code changes have been made to achieve the intent.
+
+## Checks
+
+- [ ] Code is formatted correctly (`npm run lint:fix`).
+- [ ] All unit tests are passing (`npm test`).
+- [ ] All `sasjs-tests` unit tests are passing (`npm test`).
+- [ ] All `sasjs-tests` are passing (instructions available [here](https://github.com/sasjs/adapter/blob/master/sasjs-tests/README.md)).

example.html

@@ -30,8 +30,8 @@
         $('#chart-container').append('<canvas id="myChart" style="display: none;"></canvas>')
         // make a request to a SAS service
         var type = $("#cars")[0].options[$("#cars")[0].selectedIndex].value;
-        // request data from an endpoint under your appLoc
+        // request data from an endpoint under your appLoc (missing opening slash implies relative path)
-        sasJs.request("/common/getdata", {
+        sasJs.request("common/getdata", {
             // send data as an array of objects - each object is one row
             fromjs: [{ type: type }] 
         }).then((response) => {

package.json

@@ -37,23 +37,24 @@
   "license": "ISC",
   "devDependencies": {
     "@types/isomorphic-fetch": "0.0.35",
-    "@types/jest": "^26.0.13",
+    "@types/jest": "^26.0.15",
     "cp": "^0.2.0",
+    "dotenv": "^8.2.0",
     "jest": "^25.5.4",
     "path": "^0.12.7",
     "rimraf": "^3.0.2",
-    "semantic-release": "^17.1.1",
+    "semantic-release": "^17.2.3",
+    "terser-webpack-plugin": "^4.2.3",
     "ts-jest": "^25.5.1",
-    "ts-loader": "^8.0.3",
+    "ts-loader": "^8.0.11",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
     "typedoc": "^0.17.8",
     "typedoc-neo-theme": "^1.0.10",
     "typedoc-plugin-external-module-name": "^4.0.3",
     "typescript": "^3.9.7",
-    "uglifyjs-webpack-plugin": "^2.2.0",
+    "webpack": "^4.44.2",
-    "webpack": "^4.44.1",
+    "webpack-cli": "^4.2.0"
-    "webpack-cli": "^3.3.12"
   },
   "main": "index.js",
   "dependencies": {

sasjs-tests/package-lock.json

@@ -1357,9 +1357,9 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
     },
     "@sasjs/adapter": {
-      "version": "1.3.13",
+      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.3.13.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.12.0.tgz",
-      "integrity": "sha512-dWcDxgY3FB7Yx1I5dPpeQeyJDu4lezhIFrjn6lbdwRhV15aqOt4l9o9qZP+VbgOXqyi9gN0Y+p+vs2chBDFQqg==",
+      "integrity": "sha512-0uGQH9ynomWzdBaEujEtcR38q6V7LCgG0mrb1Wellv6cC/IHD3j6WfeZZAgtiMPeOSJjbCDBOlVnzC2TlBqJFw==",
       "requires": {
         "es6-promise": "^4.2.8",
         "form-data": "^3.0.0",

sasjs-tests/package.json

@@ -4,7 +4,7 @@
   "homepage": ".",
   "private": true,
   "dependencies": {
-    "@sasjs/adapter": "^1.3.13",
+    "@sasjs/adapter": "^1.12.0",
     "@sasjs/test-framework": "^1.4.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",

sasjs-tests/src/App.tsx

@@ -5,6 +5,7 @@ import { sendArrTests, sendObjTests } from "./testSuites/RequestData";
 import { specialCaseTests } from "./testSuites/SpecialCases";
 import { sasjsRequestTests } from "./testSuites/SasjsRequests";
 import "@sasjs/test-framework/dist/index.css";
+import { computeTests } from "./testSuites/Compute";
 
 const App = (): ReactElement<{}> => {
   const { adapter, config } = useContext(AppContext);
@@ -17,7 +18,8 @@ const App = (): ReactElement<{}> => {
         sendArrTests(adapter),
         sendObjTests(adapter),
         specialCaseTests(adapter),
-        sasjsRequestTests(adapter)
+        sasjsRequestTests(adapter),
+        computeTests(adapter)
       ]);
     }
   }, [adapter, config]);

sasjs-tests/src/testSuites/Basic.ts

@@ -13,7 +13,7 @@ const defaultConfig: SASjsConfig = {
 };
 
 const customConfig = {
-  serverUrl: "url",
+  serverUrl: "http://url.com",
   pathSAS9: "sas9",
   pathSASViya: "viya",
   appLoc: "/Public/seedapp",
@@ -37,6 +37,17 @@ export const basicTests = (
       assertion: (response: any) =>
         response && response.isLoggedIn && response.userName === userName
     },
+    {
+      title: "Multiple Log in attempts",
+      description: "Should fail on first attempt and should log the user in on second attempt",
+      test: async () => {
+        await adapter.logOut()
+        await adapter.logIn('invalid', 'invalid')
+        return adapter.logIn(userName, password)
+      },
+      assertion: (response: any) =>
+        response && response.isLoggedIn && response.userName === userName
+    },
     {
       title: "Default config",
       description:

sasjs-tests/src/testSuites/Compute.ts

@@ -0,0 +1,41 @@
+import SASjs from "@sasjs/adapter";
+import { TestSuite } from "@sasjs/test-framework";
+
+export const computeTests = (adapter: SASjs): TestSuite => ({
+  name: "Compute",
+  tests: [
+    {
+      title: "Start Compute Job - not waiting for result",
+      description: "Should start a compute job and return the session",
+      test: () => {
+        const data: any = { table1: [{ col1: "first col value" }] };
+        return adapter.startComputeJob("/Public/app/common/sendArr", data);
+      },
+      assertion: (res: any) => {
+        const expectedProperties = ["id", "applicationName", "attributes"]
+        return validate(expectedProperties, res);
+      }
+    },
+    {
+      title: "Start Compute Job - waiting for result",
+      description: "Should start a compute job and return the job",
+      test: () => {
+        const data: any = { table1: [{ col1: "first col value" }] };
+        return adapter.startComputeJob("/Public/app/common/sendArr", data, {}, "", true);
+      },
+      assertion: (res: any) => {
+        const expectedProperties = ["id", "state", "creationTimeStamp", "jobConditionCode"]
+        return validate(expectedProperties, res);
+      }
+    }
+  ]
+});
+
+const validate = (expectedProperties: string[], data: any): boolean => {
+  const actualProperties = Object.keys(data);
+
+        const isValid = expectedProperties.every(
+          (property) => actualProperties.includes(property)
+        );
+        return isValid
+}

sasjs-tests/src/testSuites/RequestData.ts

@@ -47,6 +47,16 @@ const getLargeObjectData = () => {
 export const sendArrTests = (adapter: SASjs): TestSuite => ({
   name: "sendArr",
   tests: [
+    {
+      title: "Absolute paths",
+      description: "Should work with absolute paths to SAS jobs",
+      test: () => {
+        return adapter.request("/Public/app/common/sendArr", stringData);
+      },
+      assertion: (res: any) => {
+        return res.table1[0][0] === stringData.table1[0].col1;
+      }
+    },
     {
       title: "Single string value",
       description: "Should send an array with a single string value",
@@ -78,7 +88,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
         return adapter.request("common/sendArr", data).catch((e) => e);
       },
       assertion: (error: any) => {
-        return !!error && !!error.MESSAGE;
+        return !!error && !!error.body && !!error.body.message;
       }
     },
     {
@@ -175,7 +185,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
         };
         return adapter.request("common/sendObj", invalidData).catch((e) => e);
       },
-      assertion: (error: any) => !!error && !!error.MESSAGE
+      assertion: (error: any) => !!error && !!error.body && !!error.body.message
     },
     {
       title: "Single string value",
@@ -209,7 +219,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
           .catch((e) => e);
       },
       assertion: (error: any) => {
-        return !!error && !!error.MESSAGE;
+        return !!error && !!error.body && !!error.body.message;
       }
     },
     {

src/FileUploader.ts

@@ -1,6 +1,7 @@
 import { isLogInRequired, needsRetry, isUrl } from './utils'
 import { CsrfToken } from './types/CsrfToken'
 import { UploadFile } from './types/UploadFile'
+import { ErrorResponse } from './types'
 
 const requestRetryLimit = 5
 
@@ -18,8 +19,11 @@ export class FileUploader {
   private retryCount = 0
 
   public uploadFile(sasJob: string, files: UploadFile[], params: any) {
+    return new Promise((resolve, reject) => {
       if (files?.length < 1)
-      throw new Error('At least one file must be provided.')
+        reject(new ErrorResponse('At least one file must be provided.'))
+      if (!sasJob || sasJob === '')
+        reject(new ErrorResponse('sasJob must be provided.'))
 
       let paramsString = ''
 
@@ -40,7 +44,6 @@ export class FileUploader {
         'cache-control': 'no-cache'
       }
 
-    return new Promise((resolve, reject) => {
       const formData = new FormData()
 
       for (let file of files) {
@@ -76,7 +79,7 @@ export class FileUploader {
         })
         .then((responseText) => {
           if (isLogInRequired(responseText))
-            reject('You must be logged in to upload a file')
+            reject(new ErrorResponse('You must be logged in to upload a file.'))
 
           if (needsRetry(responseText)) {
             if (this.retryCount < requestRetryLimit) {
@@ -95,10 +98,18 @@ export class FileUploader {
             try {
               resolve(JSON.parse(responseText))
             } catch (e) {
-              reject(e)
+              reject(
+                new ErrorResponse(
+                  'Error while parsing json from upload response.',
+                  e
+                )
+              )
             }
           }
         })
+        .catch((err: any) => {
+          reject(new ErrorResponse('Upload request failed.', err))
+        })
     })
   }
 }

src/SASViyaApiClient.ts

@@ -3,20 +3,22 @@ import {
   parseAndSubmitAuthorizeForm,
   convertToCSV,
   makeRequest,
+  isRelativePath,
   isUri,
   isUrl
 } from './utils'
 import * as NodeFormData from 'form-data'
-import * as path from 'path'
 import {
   Job,
   Session,
   Context,
+  ContextAllAttributes,
   Folder,
   CsrfToken,
-  EditContextInput
+  EditContextInput,
+  ErrorResponse,
+  JobDefinition
 } from './types'
-import { JobDefinition } from './types/JobDefinition'
 import { formatDataForRequest } from './utils/formatDataForRequest'
 import { SessionManager } from './SessionManager'
 
@@ -29,35 +31,45 @@ export class SASViyaApiClient {
     private serverUrl: string,
     private rootFolderName: string,
     private contextName: string,
-    private setCsrfToken: (csrfToken: CsrfToken) => void,
+    private setCsrfToken: (csrfToken: CsrfToken) => void
-    private rootFolderMap = new Map<string, Job[]>()
   ) {
-    if (!rootFolderName) {
-      throw new Error('Root folder must be provided.')
-    }
-
     if (serverUrl) isUrl(serverUrl)
   }
 
   private csrfToken: CsrfToken | null = null
-  private rootFolder: Folder | null = null
+  private fileUploadCsrfToken: CsrfToken | null = null
+  private _debug = false
   private sessionManager = new SessionManager(
     this.serverUrl,
     this.contextName,
     this.setCsrfToken
   )
-  private isForceDeploy: boolean = false
+  private folderMap = new Map<string, Job[]>()
 
-  /**
+  public get debug() {
-   * Returns a map containing the directory structure in the currently set root folder.
+    return this._debug
-   */
-  public async getAppLocMap() {
-    if (this.rootFolderMap.size) {
-      return this.rootFolderMap
   }
 
-    this.populateRootFolderMap()
+  public set debug(value: boolean) {
-    return this.rootFolderMap
+    this._debug = value
+    if (this.sessionManager) {
+      this.sessionManager.debug = value
+    }
+  }
+
+  /**
+   * Returns a list of jobs in the currently set root folder.
+   */
+  public async getJobsInFolder(folderPath: string) {
+    const path = isRelativePath(folderPath)
+      ? `${this.rootFolderName}/${folderPath}`
+      : folderPath
+    if (this.folderMap.get(path)) {
+      return this.folderMap.get(path)
+    }
+
+    await this.populateFolderMap(path)
+    return this.folderMap.get(path)
   }
 
   /**
@@ -135,32 +147,36 @@ export class SASViyaApiClient {
     const promises = contextsList.map((context: any) => {
       const linesOfCode = ['%put &=sysuserid;']
 
-      return this.executeScript(
+      return () =>
+        this.executeScript(
           `test-${context.name}`,
           linesOfCode,
           context.name,
           accessToken,
-        false,
           null,
+          true,
           true
-      ).catch(() => null)
+        ).catch((err) => err)
     })
 
-    const results = await Promise.all(promises)
+    let results: any[] = []
+
+    for (const promise of promises) results.push(await promise())
 
     results.forEach((result: any, index: number) => {
-      if (result) {
+      if (result && result.error && result.error.details) {
+        try {
+          const resultParsed = result.error.details
+
+          if (resultParsed && resultParsed.body) {
             let sysUserId = ''
 
-        if (result.log) {
+            const sysUserIdLog = resultParsed.body
-          const sysUserIdLog = result.log
               .split('\n')
               .find((line: string) => line.startsWith('SYSUSERID='))
 
             if (sysUserIdLog) {
               sysUserId = sysUserIdLog.replace('SYSUSERID=', '')
-          }
-        }
 
               executableContexts.push({
                 createdBy: contextsList[index].createdBy,
@@ -172,6 +188,11 @@ export class SASViyaApiClient {
                 }
               })
             }
+          }
+        } catch (error) {
+          throw error
+        }
+      }
     })
 
     return executableContexts
@@ -192,7 +213,7 @@ export class SASViyaApiClient {
     }
 
     const { result: contexts } = await this.request<{ items: Context[] }>(
-      `${this.serverUrl}/compute/contexts`,
+      `${this.serverUrl}/compute/contexts?limit=10000`,
       { headers }
     )
     const executionContext =
@@ -224,16 +245,16 @@ export class SASViyaApiClient {
    * @param launchContextName - the name of the launcher context used by the compute service.
    * @param sharedAccountId - the ID of the account to run the servers for this context.
    * @param autoExecLines - the lines of code to execute during session initialization.
-   * @param authorizedUsers - an optional list of authorized user IDs.
    * @param accessToken - an access token for an authorized user.
+   * @param authorizedUsers - an optional list of authorized user IDs.
    */
   public async createContext(
     contextName: string,
     launchContextName: string,
     sharedAccountId: string,
     autoExecLines: string[],
-    authorizedUsers: string[],
+    accessToken?: string,
-    accessToken?: string
+    authorizedUsers?: string[]
   ) {
     if (!contextName) {
       throw new Error('Context name is required.')
@@ -313,10 +334,24 @@ export class SASViyaApiClient {
       headers.Authorization = `Bearer ${accessToken}`
     }
 
-    const originalContext = await this.getContextByName(
+    let originalContext
+
+    originalContext = await this.getComputeContextByName(
       contextName,
       accessToken
-    )
+    ).catch((err) => {
+      throw err
+    })
+
+    // Try to find context by id, when context name has been changed.
+    if (!originalContext) {
+      originalContext = await this.getComputeContextById(
+        editedContext.id!,
+        accessToken
+      ).catch((err) => {
+        throw err
+      })
+    }
 
     const { result: context, etag } = await this.request<Context>(
       `${this.serverUrl}/compute/contexts/${originalContext.id}`,
@@ -372,7 +407,7 @@ export class SASViyaApiClient {
       headers.Authorization = `Bearer ${accessToken}`
     }
 
-    const context = await this.getContextByName(contextName, accessToken)
+    const context = await this.getComputeContextByName(contextName, accessToken)
 
     const deleteContextRequest: RequestInit = {
       method: 'DELETE',
@@ -387,27 +422,24 @@ export class SASViyaApiClient {
 
   /**
    * Executes code on the current SAS Viya server.
-   * @param fileName - a name for the file being submitted for execution.
+   * @param jobPath - the path to the file being submitted for execution.
    * @param linesOfCode - an array of code lines to execute.
    * @param contextName - the context to execute the code in.
    * @param accessToken - an access token for an authorized user.
    * @param sessionId - optional session ID to reuse.
-   * @param silent - optional flag to disable logging.
    * @param data - execution data.
    * @param debug - when set to true, the log will be returned.
    * @param expectWebout - when set to true, the automatic _webout fileref will be checked for content, and that content returned. This fileref is used when the Job contains a SASjs web request (as opposed to executing arbitrary SAS code).
    */
   public async executeScript(
-    jobName: string,
+    jobPath: string,
     linesOfCode: string[],
     contextName: string,
     accessToken?: string,
-    silent = false,
     data = null,
-    debug = false,
+    expectWebout = false,
-    expectWebout = false
+    waitForResult = true
   ): Promise<any> {
-    silent = !debug
     try {
       const headers: any = {
         'Content-Type': 'application/json'
@@ -418,7 +450,12 @@ export class SASViyaApiClient {
       }
 
       let executionSessionId: string
-      const session = await this.sessionManager.getSession(accessToken)
+      const session = await this.sessionManager
+        .getSession(accessToken)
+        .catch((err) => {
+          throw err
+        })
+
       executionSessionId = session!.id
 
       const jobArguments: { [key: string]: any } = {
@@ -430,26 +467,36 @@ export class SASViyaApiClient {
         _OMITTEXTLOG: true
       }
 
-      if (debug) {
+      if (this.debug) {
         jobArguments['_OMITTEXTLOG'] = false
         jobArguments['_OMITSESSIONRESULTS'] = false
         jobArguments['_DEBUG'] = 131
       }
 
-      const fileName = `exec-${
+      let fileName
-        jobName.includes('/') ? jobName.split('/')[1] : jobName
+      if (isRelativePath(jobPath)) {
+        fileName = `exec-${
+          jobPath.includes('/') ? jobPath.split('/')[1] : jobPath
         }`
+      } else {
+        const jobPathParts = jobPath.split('/')
+        fileName = jobPathParts.pop()
+      }
 
       let jobVariables: any = {
         SYS_JES_JOB_URI: '',
-        _program: this.rootFolderName + '/' + jobName
+        _program: isRelativePath(jobPath)
+          ? this.rootFolderName + '/' + jobPath
+          : jobPath
       }
 
       let files: any[] = []
 
       if (data) {
         if (JSON.stringify(data).includes(';')) {
-          files = await this.uploadTables(data, accessToken)
+          files = await this.uploadTables(data, accessToken).catch((err) => {
+            throw err
+          })
 
           jobVariables['_webin_file_count'] = files.length
 
@@ -480,9 +527,15 @@ export class SASViyaApiClient {
       const { result: postedJob, etag } = await this.request<Job>(
         `${this.serverUrl}/compute/sessions/${executionSessionId}/jobs`,
         postJobRequest
-      )
+      ).catch((err) => {
+        throw err
+      })
 
-      if (!silent) {
+      if (!waitForResult) {
+        return session
+      }
+
+      if (this.debug) {
         console.log(`Job has been submitted for '${fileName}'.`)
         console.log(
           `You can monitor the job progress at '${this.serverUrl}${
@@ -491,32 +544,33 @@ export class SASViyaApiClient {
         )
       }
 
-      const jobStatus = await this.pollJobState(
+      const jobStatus = await this.pollJobState(postedJob, etag, accessToken)
-        postedJob,
-        etag,
-        accessToken,
-        silent
-      )
 
       const { result: currentJob } = await this.request<Job>(
         `${this.serverUrl}/compute/sessions/${executionSessionId}/jobs/${postedJob.id}`,
         { headers }
-      )
+      ).catch((err) => {
+        throw err
+      })
 
       let jobResult
       let log
 
       const logLink = currentJob.links.find((l) => l.rel === 'log')
 
-      if (debug && logLink) {
+      if (this.debug && logLink) {
         log = await this.request<any>(
           `${this.serverUrl}${logLink.href}/content?limit=10000`,
           {
             headers
           }
-        ).then((res: any) =>
+        )
+          .then((res: any) =>
             res.result.items.map((i: any) => i.line).join('\n')
           )
+          .catch((err) => {
+            throw err
+          })
       }
 
       if (jobStatus === 'failed' || jobStatus === 'error') {
@@ -527,6 +581,8 @@ export class SASViyaApiClient {
 
       if (expectWebout) {
         resultLink = `/compute/sessions/${executionSessionId}/filerefs/_webout/content`
+      } else {
+        return currentJob
       }
 
       if (resultLink) {
@@ -534,24 +590,53 @@ export class SASViyaApiClient {
           `${this.serverUrl}${resultLink}`,
           { headers },
           'text'
-        ).catch((e) => ({
+        ).catch(async (e) => {
+          if (e && e.status === 404) {
+            if (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')
+                )
+                .catch((err) => {
+                  throw err
+                })
+
+              return Promise.reject(
+                new ErrorResponse('Job execution failed.', {
+                  status: 500,
+                  body: log
+                })
+              )
+            }
+          }
+          return {
             result: JSON.stringify(e)
-        }))
+          }
+        })
       }
 
-      await this.sessionManager.clearSession(executionSessionId, accessToken)
+      await this.sessionManager
+        .clearSession(executionSessionId, accessToken)
+        .catch((err) => {
+          throw err
+        })
 
       return { result: jobResult?.result, log }
     } catch (e) {
       if (e && e.status === 404) {
         return this.executeScript(
-          jobName,
+          jobPath,
           linesOfCode,
           contextName,
           accessToken,
-          silent,
           data,
-          debug
+          false,
+          true
         )
       } else {
         throw e
@@ -583,8 +668,6 @@ export class SASViyaApiClient {
     if (!parentFolderUri && parentFolderPath) {
       parentFolderUri = await this.getFolderUri(parentFolderPath, accessToken)
       if (!parentFolderUri) {
-        if (isForced) this.isForceDeploy = true
-
         console.log(
           `Parent folder at path '${parentFolderPath}' is not present.`
         )
@@ -610,37 +693,16 @@ export class SASViyaApiClient {
           `Parent folder '${newFolderName}' has been successfully created.`
         )
         parentFolderUri = `/folders/folders/${parentFolder.id}`
-      } else if (isForced && accessToken && !this.isForceDeploy) {
+      } else if (isForced && accessToken) {
-        this.isForceDeploy = true
+        const folderPath = parentFolderPath + '/' + folderName
+        const folderUri = await this.getFolderUri(folderPath, accessToken)
 
-        await this.deleteFolder(parentFolderPath, accessToken)
+        if (folderUri) {
-
+          await this.deleteFolder(
-        const newParentFolderPath = parentFolderPath.substring(
+            parentFolderPath + '/' + folderName,
-          0,
-          parentFolderPath.lastIndexOf('/')
-        )
-        const newFolderName = `${parentFolderPath.split('/').pop()}`
-
-        if (newParentFolderPath === '') {
-          throw new Error(`Root folder has to be present on the server.`)
-        }
-
-        console.log(
-          `Creating parent folder:\n'${newFolderName}' in '${newParentFolderPath}'`
-        )
-
-        const parentFolder = await this.createFolder(
-          newFolderName,
-          newParentFolderPath,
-          undefined,
             accessToken
           )
-
+        }
-        console.log(
-          `Parent folder '${newFolderName}' has been successfully created.`
-        )
-
-        parentFolderUri = `/folders/folders/${parentFolder.id}`
       }
     }
 
@@ -662,8 +724,11 @@ export class SASViyaApiClient {
       createFolderRequest
     )
 
-    // updates rootFolderMap with newly created folder.
+    // update folder map with newly created folder.
-    await this.populateRootFolderMap(accessToken)
+    await this.populateFolderMap(
+      `${parentFolderPath}/${folderName}`,
+      accessToken
+    )
     return createFolderResponse
   }
 
@@ -884,38 +949,62 @@ export class SASViyaApiClient {
    * @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.
+   * @param waitForResult - a boolean indicating if the function should wait for a result.
+   * @param expectWebout - a boolean indicating whether to expect a _webout response.
    */
   public async executeComputeJob(
     sasJob: string,
     contextName: string,
-    debug: boolean,
     data?: any,
-    accessToken?: string
+    accessToken?: string,
+    waitForResult = true,
+    expectWebout = false
   ) {
-    if (!this.rootFolder) {
+    if (isRelativePath(sasJob) && !this.rootFolderName) {
-      await this.populateRootFolder(accessToken)
-    }
-    if (!this.rootFolder) {
-      throw new Error(`Root folder was not found.`)
-    }
-    if (!this.rootFolderMap.size) {
-      await this.populateRootFolderMap(accessToken)
-    }
-    if (!this.rootFolderMap.size) {
       throw new Error(
-        `The job '${sasJob}' was not found in '${this.rootFolderName}'.`
+        'Relative paths cannot be used without specifying a root folder name'
       )
     }
 
+    if (isRelativePath(sasJob)) {
+      const folderName = sasJob.split('/')[0]
+      await this.populateFolderMap(
+        `${this.rootFolderName}/${folderName}`,
+        accessToken
+      )
+
+      if (!this.folderMap.get(`${this.rootFolderName}/${folderName}`)) {
+        throw new Error(
+          `The folder '${folderName}' was not found at '${this.serverUrl}/${this.rootFolderName}'`
+        )
+      }
+    } else {
+      const folderPathParts = sasJob.split('/')
+      folderPathParts.pop()
+      const folderPath = folderPathParts.join('/')
+      await this.populateFolderMap(folderPath, accessToken)
+    }
+
     const headers: any = { 'Content-Type': 'application/json' }
     if (!!accessToken) {
       headers.Authorization = `Bearer ${accessToken}`
     }
 
+    let jobToExecute
+    if (isRelativePath(sasJob)) {
       const folderName = sasJob.split('/')[0]
       const jobName = sasJob.split('/')[1]
-    const jobFolder = this.rootFolderMap.get(folderName)
+      const jobFolder = this.folderMap.get(
-    const jobToExecute = jobFolder?.find((item) => item.name === jobName)
+        `${this.rootFolderName}/${folderName}`
+      )
+      jobToExecute = jobFolder?.find((item) => item.name === jobName)
+    } else {
+      const folderPathParts = sasJob.split('/')
+      const jobName = folderPathParts.pop()
+      const folderPath = folderPathParts.join('/')
+      const jobFolder = this.folderMap.get(folderPath)
+      jobToExecute = jobFolder?.find((item) => item.name === jobName)
+    }
 
     if (!jobToExecute) {
       throw new Error(`Job was not found.`)
@@ -943,22 +1032,23 @@ export class SASViyaApiClient {
       jobToExecute.code = code
     }
 
+    if (!code) code = ''
+
     const linesToExecute = code.replace(/\r\n/g, '\n').split('\n')
     return await this.executeScript(
       sasJob,
       linesToExecute,
       contextName,
       accessToken,
-      true,
       data,
-      debug,
+      expectWebout,
-      true
+      waitForResult
     )
   }
 
   /**
-   * Executes a job via the SAS Viya Job Execution API.
+   * Executes a job via the SAS Viya Job Execution API
-   * @param sasJob - the relative path to the job.
+   * @param sasJob - the relative or absolute 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.
@@ -971,20 +1061,34 @@ export class SASViyaApiClient {
     data?: any,
     accessToken?: string
   ) {
-    if (!this.rootFolder) {
+    if (isRelativePath(sasJob) && !this.rootFolderName) {
-      await this.populateRootFolder(accessToken)
+      throw new Error(
+        'Relative paths cannot be used without specifying a root folder name.'
+      )
     }
 
-    if (!this.rootFolder) {
+    if (isRelativePath(sasJob)) {
-      throw new Error(`Root folder was not found.`)
+      const folderName = sasJob.split('/')[0]
-    }
+      await this.populateFolderMap(
-    if (!this.rootFolderMap.size) {
+        `${this.rootFolderName}/${folderName}`,
-      await this.populateRootFolderMap(accessToken)
+        accessToken
-    }
-    if (!this.rootFolderMap.size) {
-      throw new Error(
-        `The job '${sasJob}' was not found in folder '${this.rootFolderName}'.`
       )
+
+      if (!this.folderMap.get(`${this.rootFolderName}/${folderName}`)) {
+        throw new Error(
+          `The folder '${folderName}' was not found at '${this.serverUrl}/${this.rootFolderName}'.`
+        )
+      }
+    } else {
+      const folderPathParts = sasJob.split('/')
+      folderPathParts.pop()
+      const folderPath = folderPathParts.join('/')
+      await this.populateFolderMap(folderPath, accessToken)
+      if (!this.folderMap.get(folderPath)) {
+        throw new Error(
+          `The folder '${folderPath}' was not found at '${this.serverUrl}'.`
+        )
+      }
     }
 
     let files: any[] = []
@@ -992,25 +1096,29 @@ export class SASViyaApiClient {
       files = await this.uploadTables(data, accessToken)
     }
 
-    const jobName = path.basename(sasJob)
+    let jobToExecute: Job | undefined
-    const jobFolder = sasJob.replace(`/${jobName}`, '')
+    let jobName: string | undefined
-    const allJobsInFolder = this.rootFolderMap.get(jobFolder.replace('/', ''))
+    let jobPath: string | undefined
-
+    if (isRelativePath(sasJob)) {
-    if (allJobsInFolder) {
+      const folderName = sasJob.split('/')[0]
-      const jobSpec = allJobsInFolder.find((j: Job) => j.name === jobName)
+      jobName = sasJob.split('/')[1]
-
+      jobPath = `${this.rootFolderName}/${folderName}`
-      if (!jobSpec) {
+      const jobFolder = this.folderMap.get(jobPath)
-        throw new Error('Job was not found.')
+      jobToExecute = jobFolder?.find((item) => item.name === jobName)
+    } else {
+      const folderPathParts = sasJob.split('/')
+      jobName = folderPathParts.pop()
+      jobPath = folderPathParts.join('/')
+      const jobFolder = this.folderMap.get(jobPath)
+      jobToExecute = jobFolder?.find((item) => item.name === jobName)
     }
 
-      const jobDefinitionLink = jobSpec?.links.find(
+    if (!jobToExecute) {
+      throw new Error(`Job was not found.`)
+    }
+    const jobDefinitionLink = jobToExecute?.links.find(
       (l) => l.rel === 'getResource'
     )?.href
-
-      if (!jobDefinitionLink) {
-        throw new Error('Job definition URI was not found.')
-      }
-
     const requestInfo: any = {
       method: 'GET'
     }
@@ -1029,7 +1137,7 @@ export class SASViyaApiClient {
 
     const jobArguments: { [key: string]: any } = {
       _contextName: contextName,
-        _program: `${this.rootFolderName}/${sasJob}`,
+      _program: `${jobPath}/${jobName}`,
       _webin_file_count: files.length,
       _OMITJSONLISTING: true,
       _OMITJSONLOG: true,
@@ -1065,18 +1173,14 @@ export class SASViyaApiClient {
       `${this.serverUrl}/jobExecution/jobs?_action=wait`,
       postJobRequest
     )
-      const jobStatus = await this.pollJobState(
+    const jobStatus = await this.pollJobState(postedJob, etag, accessToken)
-        postedJob,
-        etag,
-        accessToken,
-        true
-      )
     const { result: currentJob } = await this.request<Job>(
       `${this.serverUrl}/jobExecution/jobs/${postedJob.id}`,
       { headers }
     )
 
-      let jobResult, log
+    let jobResult
+    let log
     if (jobStatus === 'failed') {
       return Promise.reject(currentJob.error)
     }
@@ -1095,21 +1199,20 @@ export class SASViyaApiClient {
         {
           headers
         }
-        ).then((res: any) =>
+      ).then((res: any) => res.result.items.map((i: any) => i.line).join('\n'))
-          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 in folder '${this.rootFolderName}'.`
-      )
-    }
   }
 
-  private async populateRootFolderMap(accessToken?: string) {
+  private async populateFolderMap(folderPath: string, accessToken?: string) {
-    const allItems = new Map<string, Job[]>()
+    const path = isRelativePath(folderPath)
-    const url = '/folders/folders/@item?path=' + this.rootFolderName
+      ? `${this.rootFolderName}/${folderPath}`
+      : folderPath
+    if (this.folderMap.get(path)) {
+      return
+    }
+
+    const url = '/folders/folders/@item?path=' + path
     const requestInfo: any = {
       method: 'GET'
     }
@@ -1121,9 +1224,7 @@ export class SASViyaApiClient {
       requestInfo
     )
     if (!folder) {
-      throw new Error(
+      throw new Error(`The path ${path} does not exist on ${this.serverUrl}`)
-        `Not able to populate root folder map, because folder '${this.rootFolderName}' does not exist.`
-      )
     }
     const { result: members } = await this.request<{ items: any[] }>(
       `${this.serverUrl}/folders/folders/${folder.id}/members`,
@@ -1131,62 +1232,13 @@ export class SASViyaApiClient {
     )
 
     const itemsAtRoot = members.items
-    allItems.set('', itemsAtRoot)
+    this.folderMap.set(path, itemsAtRoot)
-    const subfolderRequests = members.items
-      .filter((i: any) => i.contentType === 'folder')
-      .map(async (member: any) => {
-        const subFolderUrl =
-          '/folders/folders/@item?path=' +
-          this.rootFolderName +
-          '/' +
-          member.name
-        const { result: memberDetail } = await this.request<Folder>(
-          `${this.serverUrl}${subFolderUrl}`,
-          requestInfo
-        )
-
-        const membersLink = memberDetail.links.find(
-          (l: any) => l.rel === 'members'
-        )
-
-        const { result: memberContents } = await this.request<{ items: any[] }>(
-          `${this.serverUrl}${membersLink!.href}`,
-          requestInfo
-        )
-        const itemsInFolder = memberContents.items as any[]
-        allItems.set(member.name, itemsInFolder)
-        return itemsInFolder
-      })
-    await Promise.all(subfolderRequests)
-
-    this.rootFolderMap = allItems
-  }
-
-  private async populateRootFolder(accessToken?: string) {
-    const url = '/folders/folders/@item?path=' + this.rootFolderName
-    const requestInfo: RequestInit = {
-      method: 'GET'
-    }
-    if (accessToken) {
-      requestInfo.headers = { Authorization: `Bearer ${accessToken}` }
-    }
-    let error
-    const rootFolder = await this.request<Folder>(
-      `${this.serverUrl}${url}`,
-      requestInfo
-    )
-
-    this.rootFolder = rootFolder?.result || null
-    if (error) {
-      throw new Error(JSON.stringify(error))
-    }
   }
 
   private async pollJobState(
     postedJob: any,
     etag: string | null,
-    accessToken?: string,
+    accessToken?: string
-    silent = false
   ) {
     const MAX_POLL_COUNT = 1000
     const POLL_INTERVAL = 100
@@ -1225,7 +1277,7 @@ export class SASViyaApiClient {
           postedJobState === 'pending'
         ) {
           if (stateLink) {
-            if (!silent) {
+            if (this.debug) {
               console.log('Polling job status... \n')
             }
             const { result: jobState } = await this.request<string>(
@@ -1237,7 +1289,7 @@ export class SASViyaApiClient {
             )
 
             postedJobState = jobState.trim()
-            if (!silent) {
+            if (this.debug) {
               console.log(`Current state: ${postedJobState}\n`)
             }
             pollCount++
@@ -1253,49 +1305,6 @@ export class SASViyaApiClient {
     })
   }
 
-  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 = {
@@ -1321,7 +1330,9 @@ export class SASViyaApiClient {
 
       const uploadResponse = await this.request<any>(
         `${this.serverUrl}/files/files#rawUpload`,
-        createFileRequest
+        createFileRequest,
+        'json',
+        'fileUpload'
       )
 
       uploadedFiles.push({ tableName, file: uploadResponse.result })
@@ -1370,7 +1381,13 @@ export class SASViyaApiClient {
     return `/folders/folders/${folder.id}`
   }
 
-  private async getContextByName(
+  /**
+   * Returns a JSON representation of a compute context.
+   * @example: { "createdBy": "admin", "links": [...], "id": "ID", "version": 2, "name": "context1" }
+   * @param contextName - the name of the context to return.
+   * @param accessToken - an access token for an authorized user.
+   */
+  public async getComputeContextByName(
     contextName: string,
     accessToken?: string
   ): Promise<Context> {
@@ -1385,9 +1402,7 @@ export class SASViyaApiClient {
     const { result: contexts } = await this.request<{ items: Context[] }>(
       `${this.serverUrl}/compute/contexts?filter=eq(name, "${contextName}")`,
       { headers }
-    ).catch((err) => {
+    )
-      throw err
-    })
 
     if (!contexts || !(contexts.items && contexts.items.length)) {
       throw new Error(
@@ -1398,6 +1413,33 @@ export class SASViyaApiClient {
     return contexts.items[0]
   }
 
+  /**
+   * Returns a JSON representation of a compute context.
+   * @param contextId - an id of the context to return.
+   * @param accessToken - an access token for an authorized user.
+   */
+  public async getComputeContextById(
+    contextId: string,
+    accessToken?: string
+  ): Promise<ContextAllAttributes> {
+    const headers: any = {
+      'Content-Type': 'application/json'
+    }
+
+    if (accessToken) {
+      headers.Authorization = `Bearer ${accessToken}`
+    }
+
+    const { result: context } = await this.request<ContextAllAttributes>(
+      `${this.serverUrl}/compute/contexts/${contextId}`,
+      { headers }
+    ).catch((err) => {
+      throw err
+    })
+
+    return context
+  }
+
   /**
    * Moves a Viya folder to a new location.  The folder may be renamed at the same time.
    * @param sourceFolder - the full path (eg `/Public/example/myFolder`) or URI of the source folder to be moved. Providing URI instead of path will save one extra request.
@@ -1441,6 +1483,16 @@ export class SASViyaApiClient {
       `${this.serverUrl}${url}`,
       requestInfo
     ).catch((err) => {
+      if (err.code && err.code === 'ENOTFOUND') {
+        const notFoundError = {
+          body: JSON.stringify({
+            message: `Folder '${sourceFolder.split('/').pop()}' was not found.`
+          })
+        }
+
+        throw notFoundError
+      }
+
       throw err
     })
 
@@ -1476,22 +1528,36 @@ export class SASViyaApiClient {
     this.setCsrfToken(csrfToken)
   }
 
+  setFileUploadCsrfToken = (csrfToken: CsrfToken) => {
+    this.fileUploadCsrfToken = csrfToken
+  }
+
   private async request<T>(
     url: string,
     options: RequestInit,
-    contentType: 'text' | 'json' = 'json'
+    contentType: 'text' | 'json' = 'json',
+    type: 'fileUpload' | 'other' = 'other'
   ) {
+    const callback =
+      type === 'fileUpload'
+        ? this.setFileUploadCsrfToken
+        : this.setCsrfTokenLocal
+
+    if (type === 'other') {
       if (this.csrfToken) {
         options.headers = {
           ...options.headers,
           [this.csrfToken.headerName]: this.csrfToken.value
         }
       }
-    return await makeRequest<T>(
+    } else {
-      url,
+      if (this.fileUploadCsrfToken) {
-      options,
+        options.headers = {
-      this.setCsrfTokenLocal,
+          ...options.headers,
-      contentType
+          [this.fileUploadCsrfToken.headerName]: this.fileUploadCsrfToken.value
-    )
+        }
+      }
+    }
+    return await makeRequest<T>(url, options, callback, contentType)
   }
 }

src/SASjs.ts

@@ -21,7 +21,8 @@ import {
   parseGeneratedCode,
   parseWeboutResponse,
   needsRetry,
-  asyncForEach
+  asyncForEach,
+  isRelativePath
 } from './utils'
 import {
   SASjsConfig,
@@ -43,7 +44,7 @@ const defaultConfig: SASjsConfig = {
   pathSASViya: '/SASJobExecution',
   appLoc: '/Public/seedapp',
   serverType: ServerType.SASViya,
-  debug: true,
+  debug: false,
   contextName: 'SAS Job Execution compute context',
   useComputeApi: false
 }
@@ -112,16 +113,16 @@ export default class SASjs {
    * @param launchContextName - the name of the launcher context used by the compute service.
    * @param sharedAccountId - the ID of the account to run the servers for this context as.
    * @param autoExecLines - the lines of code to execute during session initialization.
-   * @param authorizedUsers - an optional list of authorized user IDs.
    * @param accessToken - an access token for an authorized user.
+   * @param authorizedUsers - an optional list of authorized user IDs.
    */
   public async createContext(
     contextName: string,
     launchContextName: string,
     sharedAccountId: string,
     autoExecLines: string[],
-    authorizedUsers: string[],
+    accessToken: string,
-    accessToken: string
+    authorizedUsers?: string[]
   ) {
     this.isMethodSupported('createContext', ServerType.SASViya)
 
@@ -130,8 +131,8 @@ export default class SASjs {
       launchContextName,
       sharedAccountId,
       autoExecLines,
-      authorizedUsers,
+      accessToken,
-      accessToken
+      authorizedUsers
     )
   }
 
@@ -166,6 +167,38 @@ export default class SASjs {
     return await this.sasViyaApiClient!.deleteContext(contextName, accessToken)
   }
 
+  /**
+   * Returns a JSON representation of a compute context.
+   * @example: { "createdBy": "admin", "links": [...], "id": "ID", "version": 2, "name": "context1" }
+   * @param contextName - the name of the context to return.
+   * @param accessToken - an access token for an authorized user.
+   */
+  public async getComputeContextByName(
+    contextName: string,
+    accessToken?: string
+  ) {
+    this.isMethodSupported('getComputeContextByName', ServerType.SASViya)
+
+    return await this.sasViyaApiClient!.getComputeContextByName(
+      contextName,
+      accessToken
+    )
+  }
+
+  /**
+   * Returns a JSON representation of a compute context.
+   * @param contextId - an id of the context to return.
+   * @param accessToken - an access token for an authorized user.
+   */
+  public async getComputeContextById(contextId: string, accessToken?: string) {
+    this.isMethodSupported('getComputeContextById', ServerType.SASViya)
+
+    return await this.sasViyaApiClient!.getComputeContextById(
+      contextId,
+      accessToken
+    )
+  }
+
   public async createSession(contextName: string, accessToken: string) {
     this.isMethodSupported('createSession', ServerType.SASViya)
 
@@ -176,9 +209,7 @@ export default class SASjs {
     fileName: string,
     linesOfCode: string[],
     contextName: string,
-    accessToken?: string,
+    accessToken?: string
-    sessionId = '',
-    silent = false
   ) {
     this.isMethodSupported('executeScriptSASViya', ServerType.SASViya)
 
@@ -187,9 +218,7 @@ export default class SASjs {
       linesOfCode,
       contextName,
       accessToken,
-      silent,
+      null
-      null,
-      this.sasjsConfig.debug
     )
   }
 
@@ -210,8 +239,6 @@ export default class SASjs {
     sasApiClient?: SASViyaApiClient,
     isForced?: boolean
   ) {
-    this.isMethodSupported('createFolder', ServerType.SASViya)
-
     if (sasApiClient)
       return await sasApiClient.createFolder(
         folderName,
@@ -228,6 +255,40 @@ export default class SASjs {
     )
   }
 
+  /**
+   * For performance (and in case of accidental error) the `deleteFolder` function does not actually delete the folder (and all its content and subfolder content). Instead the folder is simply moved to the recycle bin. Deletion time will be added to the folder name.
+   * @param folderPath - the full path (eg `/Public/example/deleteThis`) of the folder to be deleted.
+   * @param accessToken - an access token for authorizing the request.
+   */
+  public async deleteFolder(folderPath: string, accessToken: string) {
+    this.isMethodSupported('deleteFolder', ServerType.SASViya)
+
+    return await this.sasViyaApiClient?.deleteFolder(folderPath, accessToken)
+  }
+
+  /**
+   * Moves folder to a new location.  The folder may be renamed at the same time.
+   * @param sourceFolder - the full path (eg `/Public/example/myFolder`) or URI of the source folder to be moved. Providing URI instead of path will save one extra request.
+   * @param targetParentFolder - the full path or URI of the _parent_ folder to which the `sourceFolder` will be moved (eg `/Public/newDestination`). To move a folder, a user has to have write permissions in targetParentFolder. Providing URI instead of path will save one extra request.
+   * @param targetFolderName - the name of the "moved" folder.  If left blank, the original folder name will be used (eg `myFolder` in `/Public/newDestination/myFolder` for the example above).  Optional field.
+   * @param accessToken - an access token for authorizing the request.
+   */
+  public async moveFolder(
+    sourceFolder: string,
+    targetParentFolder: string,
+    targetFolderName: string,
+    accessToken: string
+  ) {
+    this.isMethodSupported('moveFolder', ServerType.SASViya)
+
+    return await this.sasViyaApiClient?.moveFolder(
+      sourceFolder,
+      targetParentFolder,
+      targetFolderName,
+      accessToken
+    )
+  }
+
   public async createJobDefinition(
     jobName: string,
     code: string,
@@ -345,6 +406,32 @@ export default class SASjs {
    */
   public setDebugState(value: boolean) {
     this.sasjsConfig.debug = value
+    if (this.sasViyaApiClient) {
+      this.sasViyaApiClient.debug = value
+    }
+  }
+
+  private async getLoginForm(response: any) {
+    const pattern: RegExp = /<form.+action="(.*Logon[^"]*).*>/
+    const matches = pattern.exec(response)
+    const formInputs: any = {}
+
+    if (matches && matches.length) {
+      this.setLoginUrl(matches)
+      const inputs = response.match(/<input.*"hidden"[^>]*>/g)
+
+      if (inputs) {
+        inputs.forEach((inputStr: string) => {
+          const valueMatch = inputStr.match(/name="([^"]*)"\svalue="([^"]*)/)
+
+          if (valueMatch && valueMatch.length) {
+            formInputs[valueMatch[1]] = valueMatch[2]
+          }
+        })
+      }
+    }
+
+    return Object.keys(formInputs).length ? formInputs : null
   }
 
   /**
@@ -355,10 +442,16 @@ export default class SASjs {
     const loginResponse = await fetch(this.loginUrl.replace('.do', ''))
     const responseText = await loginResponse.text()
     const isLoggedIn = /<button.+onClick.+logout/gm.test(responseText)
+    let loginForm: any = null
+
+    if (!isLoggedIn) {
+      loginForm = await this.getLoginForm(responseText)
+    }
 
     return Promise.resolve({
       isLoggedIn,
-      userName: this.userName
+      userName: this.userName,
+      loginForm
     })
   }
 
@@ -376,7 +469,7 @@ export default class SASjs {
 
     this.userName = loginParams.username
 
-    const { isLoggedIn } = await this.checkSession()
+    const { isLoggedIn, loginForm } = await this.checkSession()
     if (isLoggedIn) {
       this.resendWaitingRequests()
 
@@ -386,15 +479,13 @@ export default class SASjs {
       })
     }
 
-    const loginForm = await this.getLoginForm()
-
     for (const key in loginForm) {
       loginParams[key] = loginForm[key]
     }
     const loginParamsStr = serialize(loginParams)
 
     return fetch(this.loginUrl, {
-      method: 'post',
+      method: 'POST',
       credentials: 'include',
       referrerPolicy: 'same-origin',
       body: loginParamsStr,
@@ -501,8 +592,6 @@ export default class SASjs {
       ...config
     }
 
-    sasJob = sasJob.startsWith('/') ? sasJob.replace('/', '') : sasJob
-
     if (config.serverType === ServerType.SASViya && config.contextName) {
       if (config.useComputeApi) {
         requestResponse = await this.executeJobViaComputeApi(
@@ -572,6 +661,7 @@ export default class SASjs {
           this.sasjsConfig.contextName,
           this.setCsrfTokenApi
         )
+        sasApiClient.debug = this.sasjsConfig.debug
       } else if (this.sasjsConfig.serverType === ServerType.SAS9) {
         sasApiClient = new SAS9ApiClient(serverUrl)
       }
@@ -607,6 +697,50 @@ export default class SASjs {
     )
   }
 
+  /**
+   * Kicks off execution of the given job via the compute API.
+   * @returns an object representing the compute session created for the given job.
+   * @param sasJob - the path to the SAS program (ultimately resolves to
+   *  the SAS `_program` parameter to run a Job Definition or SAS 9 Stored
+   *  Process). Is prepended at runtime with the value of `appLoc`.
+   * @param data - a JSON object containing one or more tables to be sent to
+   * SAS. Can be `null` if no inputs required.
+   * @param config - provide any changes to the config here, for instance to
+   * enable/disable `debug`. Any change provided will override the global config,
+   * for that particular function call.
+   * @param accessToken - a valid access token that is authorised to execute compute jobs.
+   * The access token is not required when the user is authenticated via the browser.
+   * @param waitForResult - a boolean that indicates whether the function needs to wait for execution to complete.
+   */
+  public async startComputeJob(
+    sasJob: string,
+    data: any,
+    config: any = {},
+    accessToken?: string,
+    waitForResult?: boolean
+  ) {
+    config = {
+      ...this.sasjsConfig,
+      ...config
+    }
+
+    this.isMethodSupported('startComputeJob', ServerType.SASViya)
+    if (!config.contextName) {
+      throw new Error(
+        'Context name is undefined. Please set a `contextName` in your SASjs or override config.'
+      )
+    }
+
+    return this.sasViyaApiClient?.executeComputeJob(
+      sasJob,
+      config.contextName,
+      data,
+      accessToken,
+      !!waitForResult,
+      false
+    )
+  }
+
   private async executeJobViaComputeApi(
     sasJob: string,
     data: any,
@@ -626,13 +760,16 @@ export default class SASjs {
 
     sasjsWaitingRequest.requestPromise.promise = new Promise(
       async (resolve, reject) => {
+        const waitForResult = true
+        const expectWebout = true
         this.sasViyaApiClient
           ?.executeComputeJob(
             sasJob,
             config.contextName,
-            config.debug,
             data,
-            accessToken
+            accessToken,
+            waitForResult,
+            expectWebout
           )
           .then((response) => {
             if (!config.debug) {
@@ -670,11 +807,23 @@ export default class SASjs {
               } else {
                 this.retryCountComputeApi = 0
                 reject(
-                  new ErrorResponse('Compute API retry requests limit reached')
+                  new ErrorResponse('Compute API retry requests limit reached.')
                 )
               }
             }
 
+            if (response?.log) {
+              this.appendSasjsRequest(response.log, sasJob, null)
+            }
+
+            if (error.toString().includes('Job was not found')) {
+              reject(
+                new ErrorResponse('Service not found on the server.', {
+                  sasJob: sasJob
+                })
+              )
+            }
+
             if (error && error.status === 401) {
               if (loginRequiredCallback) loginRequiredCallback(true)
               sasjsWaitingRequest.requestPromise.resolve = resolve
@@ -682,10 +831,8 @@ export default class SASjs {
               sasjsWaitingRequest.config = config
               this.sasjsWaitingRequests.push(sasjsWaitingRequest)
             } else {
-              reject(new ErrorResponse('Job execution failed', error))
+              reject(new ErrorResponse('Job execution failed.', error))
             }
-
-            this.appendSasjsRequest(response.log, sasJob, null)
           })
       }
     )
@@ -765,12 +912,24 @@ export default class SASjs {
                   } else {
                     this.retryCountJeseApi = 0
                     reject(
-                      new ErrorResponse('Jes API retry requests limit reached')
+                      new ErrorResponse('Jes API retry requests limit reached.')
                     )
                   }
                 }
 
-                reject(new ErrorResponse('Job execution failed', e))
+                if (e?.log) {
+                  this.appendSasjsRequest(e.log, sasJob, null)
+                }
+
+                if (e.toString().includes('Job was not found')) {
+                  reject(
+                    new ErrorResponse('Service not found on the server.', {
+                      sasJob: sasJob
+                    })
+                  )
+                }
+
+                reject(new ErrorResponse('Job execution failed.', e))
               })
           )
         }
@@ -794,11 +953,15 @@ export default class SASjs {
       SASjob: sasJob,
       data
     }
-    const program = config.appLoc
+    const program = isRelativePath(sasJob)
+      ? config.appLoc
         ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
         : sasJob
+      : sasJob
     const jobUri =
-      config.serverType === 'SASVIYA' ? await this.getJobUri(sasJob) : ''
+      config.serverType === ServerType.SASViya
+        ? await this.getJobUri(sasJob)
+        : ''
     const apiUrl = `${config.serverUrl}${this.jobsPath}/?${
       jobUri.length > 0
         ? '__program=' + program + '&_job=' + jobUri
@@ -950,7 +1113,7 @@ export default class SASjs {
                   } else {
                     reject(
                       new ErrorResponse(
-                        'Job WEB execution failed',
+                        'Job WEB execution failed.',
                         this.parseSAS9ErrorResponse(responseText)
                       )
                     )
@@ -968,7 +1131,7 @@ export default class SASjs {
                         } catch (e) {
                           reject(
                             new ErrorResponse(
-                              'Job WEB debug response parsing failed',
+                              'Job WEB debug response parsing failed.',
                               { response: resText, exception: e }
                             )
                           )
@@ -977,7 +1140,7 @@ export default class SASjs {
                       (err: any) => {
                         reject(
                           new ErrorResponse(
-                            'Job WEB debug response parsing failed',
+                            'Job WEB debug response parsing failed.',
                             err
                           )
                         )
@@ -986,19 +1149,34 @@ export default class SASjs {
                   } catch (e) {
                     reject(
                       new ErrorResponse(
-                        'Job WEB debug response parsing failed',
+                        'Job WEB debug response parsing failed.',
                         { response: responseText, exception: e }
                       )
                     )
                   }
                 } else {
                   this.updateUsername(responseText)
+                  if (
+                    responseText.includes(
+                      'The requested URL /SASStoredProcess/do/ was not found on this server.'
+                    ) ||
+                    responseText.includes('Stored process not found')
+                  ) {
+                    reject(
+                      new ErrorResponse(
+                        'Service not found on the server.',
+                        { service: sasJob },
+                        responseText
+                      )
+                    )
+                  }
+
                   try {
                     const parsedJson = JSON.parse(responseText)
                     resolve(parsedJson)
                   } catch (e) {
                     reject(
-                      new ErrorResponse('Job WEB response parsing failed', {
+                      new ErrorResponse('Job WEB response parsing failed.', {
                         response: responseText,
                         exception: e
                       })
@@ -1009,7 +1187,7 @@ export default class SASjs {
             }
           })
           .catch((e: Error) => {
-            reject(new ErrorResponse('Job WEB request failed', e))
+            reject(new ErrorResponse('Job WEB request failed.', e))
           })
       }
     )
@@ -1091,14 +1269,20 @@ export default class SASjs {
 
   private async getJobUri(sasJob: string) {
     if (!this.sasViyaApiClient) return ''
-    const jobMap: any = await this.sasViyaApiClient.getAppLocMap()
     let uri = ''
 
-    if (jobMap.size) {
+    let folderPath
-      const jobKey = sasJob.split('/')[0]
+    let jobName: string
-      const jobName = sasJob.split('/')[1]
+    if (isRelativePath(sasJob)) {
+      folderPath = sasJob.split('/')[0]
+      jobName = sasJob.split('/')[1]
+    } else {
+      const folderPathParts = sasJob.split('/')
+      jobName = folderPathParts.pop() || ''
+      folderPath = folderPathParts.join('/')
+    }
 
-      const locJobs = jobMap.get(jobKey)
+    const locJobs = await this.sasViyaApiClient.getJobsInFolder(folderPath)
     if (locJobs) {
       const job = locJobs.find(
         (el: any) => el.name === jobName && el.contentType === 'jobDefinition'
@@ -1107,7 +1291,6 @@ export default class SASjs {
         uri = job.uri
       }
     }
-    }
     return uri
   }
 
@@ -1145,10 +1328,20 @@ export default class SASjs {
     }
   }
 
-  private fetchLogFileContent(logLink: string) {
+  /**
+   * Fetches content of the log file
+   * @param logLink - url of the log file.
+   * @param accessToken - an access token for an authorized user.
+   */
+  public fetchLogFileContent(logLink: string, accessToken?: string) {
+    const headers: any = { 'Content-Type': 'application/json' }
+
+    if (accessToken) headers.Authorization = 'Bearer ' + accessToken
+
     return new Promise((resolve, reject) => {
       fetch(logLink, {
-        method: 'GET'
+        method: 'GET',
+        headers
       })
         .then((response: any) => response.text())
         .then((response: any) => resolve(response))
@@ -1246,11 +1439,15 @@ export default class SASjs {
       this.sasjsConfig.serverUrl === undefined ||
       this.sasjsConfig.serverUrl === ''
     ) {
+      if (typeof location !== 'undefined') {
         let url = `${location.protocol}//${location.hostname}`
-      if (location.port) {
+
-        url = `${url}:${location.port}`
+        if (location.port) url = `${url}:${location.port}`
-      }
+
         this.sasjsConfig.serverUrl = url
+      } else {
+        this.sasjsConfig.serverUrl = ''
+      }
     }
 
     if (this.sasjsConfig.serverUrl.slice(-1) === '/') {
@@ -1280,6 +1477,8 @@ export default class SASjs {
           this.sasjsConfig.contextName,
           this.setCsrfTokenApi
         )
+
+      this.sasViyaApiClient.debug = this.sasjsConfig.debug
     }
     if (this.sasjsConfig.serverType === ServerType.SAS9) {
       if (this.sas9ApiClient)
@@ -1313,26 +1512,6 @@ export default class SASjs {
     }
   }
 
-  private async getLoginForm() {
-    const pattern: RegExp = /<form.+action="(.*Logon[^"]*).*>/
-    const response = await fetch(this.loginUrl).then((r) => r.text())
-    const matches = pattern.exec(response)
-    const formInputs: any = {}
-    if (matches && matches.length) {
-      this.setLoginUrl(matches)
-      const inputs = response.match(/<input.*"hidden"[^>]*>/g)
-      if (inputs) {
-        inputs.forEach((inputStr: string) => {
-          const valueMatch = inputStr.match(/name="([^"]*)"\svalue="([^"]*)/)
-          if (valueMatch && valueMatch.length) {
-            formInputs[valueMatch[1]] = valueMatch[2]
-          }
-        })
-      }
-    }
-    return Object.keys(formInputs).length ? formInputs : null
-  }
-
   private async createFoldersAndServices(
     parentFolder: string,
     membersJson: any[],