1
0
mirror of https://github.com/sasjs/adapter.git synced 2026-06-10 18:50:22 +00:00

Compare commits

..

28 Commits

Author SHA1 Message Date
Allan Bowe 3d99a9b1e4 Merge pull request #885 from sasjs/884-execution-tasks-web-support
Support for execution tasks
2026-05-15 09:06:15 +01:00
4gl 2a71e34179 chore: updating README and adding 2 attributes to .npmrc 2026-05-14 10:32:47 +01:00
mulahasanovic ea5d60352d fix(debug): send _debug=128 via URL for runAsTask debug, drop _omittextlog 2026-05-14 10:45:40 +02:00
mulahasanovic ac0dfae9a8 fix: skip formats table in generateTableUploadForm to avoid empty sasjs<N>data 2026-05-14 10:43:16 +02:00
mulahasanovic cd350e4e6d fix(debug): use _debug=128 instead of log for viya web with tasks 2026-05-13 15:17:53 +02:00
mulahasanovic 8f726c0ac9 fix(debug): add viya debug log parser - parse JSON from inline blob with webout 2026-05-13 14:26:12 +02:00
mulahasanovic 4cae9b5472 feat(debug): add viya debug log parser - parse JSON from inline blob 2026-05-13 14:09:47 +02:00
mulahasanovic a691500910 fix: use log instead of 131 if debug is enabled on viya with tasks enabled 2026-05-13 10:56:47 +02:00
mulahasanovic eb6b123dba test(viya): migrate execution-tasks tests to runAsTask config 2026-05-12 20:10:58 +02:00
mulahasanovic 3136e98477 feat(viya): add runAsTask config feature for execution tasks 2026-05-12 19:47:13 +02:00
mulahasanovic 2db1b9fc4b refactor(webjob): add dummy file only when neccessary
SAS Track CS0409737
2026-05-12 19:45:04 +02:00
mulahasanovic 8be0fd94ad fix(webjob): add dummy file when execution tasks flag is enabled
SAS Track CS0409737
2026-05-12 10:11:59 +02:00
Sead Mulahasanović 55db8f45ab fix(webjob): test coverage for _executionTasks=true requests without file upload (#883)
* test(cypress): show individual errors

* test(cypress): half the cypress integration test timeout

* test(cypress): add parallel tests, timeout and reports

* test(cypress): use allSettled instead of all

* test(runner): pre-render pending test cards
2026-05-12 09:53:11 +02:00
Allan Bowe eb1186b4b9 Merge pull request #881 from sasjs/fix/viya-upload-and-arguments
Viya upload and arguments
2026-05-05 15:57:59 +01:00
mulahasanovic ef1e816b09 test(sasjs): update config appLoc, enable specialCase tests 2026-05-05 16:46:23 +02:00
mulahasanovic 6552c768f9 chore: bump axios, remove node v20 support 2026-05-05 16:33:12 +02:00
mulahasanovic 31b3959e2c test(sasjs): prepend services/ to paths 2026-05-05 14:49:23 +02:00
mulahasanovic a38548d8de fix(viya): stringify JES job arguments + sasjs-tests fixes 2026-05-05 14:47:10 +02:00
mulahasanovic 7a130e129f fix(viya): skip formats keys in uploadTables 2026-05-05 14:43:49 +02:00
Allan Bowe 27a69f2959 Merge pull request #880 from sasjs/fix/bump_adapter_sasjs_tests
chore: bump adapter version in internal sasjs-tests
2026-04-29 10:29:48 +01:00
mulahasanovic 38d84e56d4 ci: disable fail-fast on build-unit-tests matrix 2026-04-14 10:23:46 +02:00
mulahasanovic 180e2ef425 test: tolerate node 24 tls error suffix 2026-04-14 10:23:20 +02:00
mulahasanovic 9177dce3e1 chore(deps): bump prettier to v3 2026-04-14 10:15:46 +02:00
mulahasanovic 9f4064b46e fix(deps): bump follow-redirects
resolve moderate advisory (GHSA-r4q5-vmmm-2653) via npm audit fix; formatting via npm run lint:fix
2026-04-14 09:54:51 +02:00
mulahasanovic 44c5eab638 ci: expand node matrix for unit tests, bump base workflows to node 22 2026-04-14 09:38:02 +02:00
mulahasanovic 0f9f16bef1 chore(sasjs-tests): remove adapter dependency to prevent npm audit on local-only package 2026-04-13 20:02:03 +02:00
mulahasanovic 5c61ede51a chore(sasjs-tests): use local adapter build to avoid npm audit on placeholder dependency 2026-04-13 19:47:50 +02:00
mulahasanovic fccb3ab965 chore: bump adapter version in internal sasjs-tests 2026-04-13 08:22:27 +02:00
52 changed files with 900 additions and 2001 deletions
+4 -2
View File
@@ -11,8 +11,9 @@ jobs:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
node-version: [lts/iron]
node-version: [22, 24]
steps:
- uses: actions/checkout@v2
@@ -32,7 +33,7 @@ jobs:
${{ runner.os }}-node-
- name: Check npm audit
run: npm audit --production --audit-level=low
run: npm audit --omit=dev --audit-level=low
- name: Install Dependencies
run: npm ci
@@ -53,6 +54,7 @@ jobs:
# For some reason if coverage report action is run before other commands, those commands can't access the directories and files on which they depend on
- name: Generate coverage report
if: matrix.node-version == 22
uses: artiomtr/jest-coverage-report-action@v2.0-rc.2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
+1 -1
View File
@@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
node-version: [lts/iron]
node-version: [22]
steps:
- name: Checkout
+1 -1
View File
@@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
node-version: [lts/iron]
node-version: [22]
steps:
- uses: actions/checkout@v2
+3 -3
View File
@@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
node-version: [lts/iron]
node-version: [22]
steps:
- uses: actions/checkout@v2
@@ -93,8 +93,8 @@ jobs:
run: |
sudo apt install jq
cd sasjs-tests
jq '.dependencies."@sasjs/adapter" |= "latest"' ./package.json > ./package.temp && mv ./package.temp ./package.json
npm i
npm i --ignore-scripts
npm i ../build/sasjs-adapter-5.0.0.tgz
jq '.sasJsConfig.serverUrl |= "${{ secrets.SASJS_SERVER_URL }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
jq '.sasJsConfig.serverType |= "SASJS"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
jq '.sasJsConfig.loginMechanism |= "Default"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+3 -1
View File
@@ -1 +1,3 @@
ignore-scripts=true
ignore-scripts=true
save-exact=true
fund=false
+1
View File
@@ -288,6 +288,7 @@ Configuration on the client side involves passing an object on startup, which ca
- `verbose` - optional, if `true` then a summary of every HTTP response is logged.
- `loginMechanism` - either `Default` or `Redirected`. See [SAS Logon](#sas-logon) section.
- `useComputeApi` - Only relevant when the serverType is `SASVIYA`. If `true` the [Compute API](#using-the-compute-api) is used. If `false` the [JES API](#using-the-jes-api) is used. If `null` or `undefined` the [Web](#using-jes-web-app) approach is used.
- `runAsTask` - Only relevant for serverType `SASVIYA` and useComputeApi `null`. Will add the `_EXECUTIONTASKS=true` URL param and thus execute jobs as Compute Tasks.
- `contextName` - Compute context on which the requests will be called. If missing or not provided, defaults to `Job Execution Compute context`.
- `requestHistoryLimit` - Request history limit. Increasing this limit may affect browser performance, especially with debug (logs) enabled. Default is 10.
+1 -1
View File
@@ -13,6 +13,6 @@ module.exports = defineConfig({
username: '',
password: '',
screenshotOnRunFailure: false,
testingFinishTimeout: 600000
testingFinishTimeout: 300000
}
})
+56 -14
View File
@@ -12,6 +12,58 @@ context('sasjs-tests', function () {
cy.visit(sasjsTestsUrl)
})
function waitForTestsToFinish(timeout: number) {
const deadline = Date.now() + timeout
function check() {
cy.get('tests-view', { log: false }).then(($view) => {
const shadow = ($view[0] as HTMLElement).shadowRoot
const stillRunning = !!shadow?.querySelector('#run-btn:disabled')
if (!stillRunning) return
if (Date.now() >= deadline) {
cy.log('Timed out waiting for tests to finish; reporting status')
return
}
cy.wait(2000, { log: false })
check()
})
}
check()
}
function assertNoFailedTests() {
cy.get('test-card').then(($cards) => {
const failed: string[] = []
const stuck: string[] = []
const pending: string[] = []
$cards.each((_, card) => {
const shadow = (card as HTMLElement).shadowRoot
if (!shadow) return
const icon = shadow.querySelector('.status-icon')
const title =
shadow.querySelector('.header h3')?.textContent?.trim() ?? '(unknown)'
if (icon?.classList.contains('failed')) {
const error =
shadow.querySelector('.error pre')?.textContent?.trim() ?? ''
failed.push(error ? `- ${title}\n ${error}` : `- ${title}`)
} else if (icon?.classList.contains('running')) {
stuck.push(`- ${title}`)
} else if (icon?.classList.contains('pending')) {
pending.push(`- ${title}`)
}
})
const parts: string[] = []
if (failed.length)
parts.push(`${failed.length} failed:\n${failed.join('\n')}`)
if (stuck.length)
parts.push(`${stuck.length} stuck (running):\n${stuck.join('\n')}`)
if (pending.length)
parts.push(
`${pending.length} did not start (pending):\n${pending.join('\n')}`
)
expect(parts, parts.join('\n\n')).to.be.empty
})
}
function loginIfNeeded() {
cy.get('login-form, tests-view', { timeout: 30000 }).should('exist')
@@ -42,14 +94,9 @@ context('sasjs-tests', function () {
cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click()
cy.get('tests-view')
.shadow()
.find('#run-btn:disabled', {
timeout: testingFinishTimeout
})
.should('not.exist')
waitForTestsToFinish(testingFinishTimeout)
cy.get('test-card').shadow().find('.status-icon.failed').should('not.exist')
assertNoFailedTests()
})
it('Should have all tests successful with debug on', () => {
@@ -63,13 +110,8 @@ context('sasjs-tests', function () {
cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click()
cy.get('tests-view')
.shadow()
.find('#run-btn:disabled', {
timeout: testingFinishTimeout
})
.should('not.exist')
waitForTestsToFinish(testingFinishTimeout)
cy.get('test-card').shadow().find('.status-icon.failed').should('not.exist')
assertNoFailedTests()
})
})
+14 -12
View File
@@ -8,7 +8,7 @@
"license": "ISC",
"dependencies": {
"@sasjs/utils": "^3.5.6",
"axios": "1.15.0",
"axios": "1.16.0",
"axios-cookiejar-support": "5.0.5",
"form-data": "4.0.4",
"https": "1.0.0",
@@ -34,7 +34,7 @@
"node-polyfill-webpack-plugin": "1.1.4",
"path": "0.12.7",
"pem": "1.14.5",
"prettier": "2.8.7",
"prettier": "3.8.2",
"process": "0.11.10",
"semantic-release": "19.0.3",
"terser-webpack-plugin": "5.3.6",
@@ -3527,12 +3527,12 @@
"license": "MIT"
},
"node_modules/axios": {
"version": "1.15.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.15.0.tgz",
"integrity": "sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==",
"version": "1.16.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz",
"integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==",
"license": "MIT",
"dependencies": {
"follow-redirects": "^1.15.11",
"follow-redirects": "^1.16.0",
"form-data": "^4.0.5",
"proxy-from-env": "^2.1.0"
}
@@ -6135,9 +6135,9 @@
}
},
"node_modules/follow-redirects": {
"version": "1.15.11",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
"integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
"version": "1.16.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
"integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
"funding": [
{
"type": "individual",
@@ -12321,14 +12321,16 @@
}
},
"node_modules/prettier": {
"version": "2.8.7",
"version": "3.8.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.2.tgz",
"integrity": "sha512-8c3mgTe0ASwWAJK+78dpviD+A8EqhndQPUBpNUIPt6+xWlIigCwfN01lWr9MAede4uqXGTEKeQWTvzb3vjia0Q==",
"dev": true,
"license": "MIT",
"bin": {
"prettier": "bin-prettier.js"
"prettier": "bin/prettier.cjs"
},
"engines": {
"node": ">=10.13.0"
"node": ">=14"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
+4 -4
View File
@@ -7,9 +7,9 @@
"build": "npm run nodeVersionMessage && npx rimraf build && npx rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && npx rimraf build/src && npx rimraf node",
"package:lib": "npm run build && copyfiles ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
"publish:lib": "npm run build && cd build && npm publish",
"lint:fix": "npx prettier --loglevel silent --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
"lint:fix": "npx prettier --log-level silent --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --write \"cypress/**/*.{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}\" && npx prettier --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
"lint:silent": "npx prettier --loglevel silent --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
"lint:silent": "npx prettier --log-level silent --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
"test": "jest --silent --coverage",
"publishInit": "cp -r ./build/* . && rm -rf ./build",
"semantic-release": "semantic-release",
@@ -60,7 +60,7 @@
"node-polyfill-webpack-plugin": "1.1.4",
"path": "0.12.7",
"pem": "1.14.5",
"prettier": "2.8.7",
"prettier": "3.8.2",
"process": "0.11.10",
"semantic-release": "19.0.3",
"terser-webpack-plugin": "5.3.6",
@@ -77,7 +77,7 @@
"main": "index.js",
"dependencies": {
"@sasjs/utils": "^3.5.6",
"axios": "1.15.0",
"axios": "1.16.0",
"axios-cookiejar-support": "5.0.5",
"form-data": "4.0.4",
"https": "1.0.0",
+2 -2
View File
@@ -6,13 +6,13 @@ Browser-based integration testing for [@sasjs/adapter](https://github.com/sasjs/
When developing on `@sasjs/adapter`, it's good practice to run the test suite against your changed version of the adapter to ensure that existing functionality has not been impacted.
You can use the provided `update:adapter` NPM script for this.
> **Note:** `@sasjs/adapter` is not listed as a dependency in `package.json` - it is installed from a local build. After cloning or running `npm install`, you must run `update:adapter` before building.
```bash
npm run update:adapter
```
This scripts builds a new version of the adapter and installs it in the `sasjs-tests` project.
This script builds a new version of the adapter and installs it in the `sasjs-tests` project.
## Running tests
+54 -1633
View File
File diff suppressed because it is too large Load Diff
-3
View File
@@ -18,8 +18,5 @@
},
"overrides": {
"vite": "npm:rolldown-vite@7.2.2"
},
"dependencies": {
"@sasjs/adapter": "^4.14.0"
}
}
+2 -2
View File
@@ -4,8 +4,8 @@
"sasJsConfig": {
"loginMechanism": "Redirected",
"serverUrl": "",
"appLoc": "/Public/app/adapter-tests/services",
"serverType": "SASVIYA",
"appLoc": "/Public/app/adapter-tests",
"serverType": "SASJS",
"debug": false,
"contextName": "SAS Job Execution compute context",
"useComputeApi": true
+32 -1
View File
@@ -72,7 +72,7 @@ export class TestCard extends HTMLElement {
? `
<div class="error">
<strong>Error:</strong>
<pre>${(error as Error).message || String(error)}</pre>
<pre>${formatError(error)}</pre>
</div>
`
: ''
@@ -110,4 +110,35 @@ export class TestCard extends HTMLElement {
}
}
const escapeHtml = (s: string) =>
s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
const formatError = (err: unknown): string => {
if (err == null) return ''
if (typeof err === 'string') return escapeHtml(err)
const anyErr = err as any
// Adapter ErrorResponse: { error: { message, details, raw } }
const nestedMsg = anyErr?.error?.message
const directMsg = anyErr?.message
const msg = directMsg || nestedMsg
if (msg) {
const details = anyErr?.error?.details ?? anyErr?.details
const detailsStr =
details && typeof details === 'object'
? `\n${JSON.stringify(details, null, 2)}`
: details
? `\n${details}`
: ''
return escapeHtml(`${msg}${detailsStr}`)
}
try {
return escapeHtml(JSON.stringify(err, null, 2))
} catch {
return escapeHtml(String(err))
}
}
customElements.define('test-card', TestCard)
+4 -2
View File
@@ -66,10 +66,11 @@ export class TestSuiteElement extends HTMLElement {
const passed = completedTests.filter((t) => t.status === 'passed').length
const failed = completedTests.filter((t) => t.status === 'failed').length
const running = completedTests.filter((t) => t.status === 'running').length
const pending = completedTests.filter((t) => t.status === 'pending').length
const statsEl = this.shadow.querySelector('.stats')
if (statsEl) {
statsEl.textContent = `Passed: ${passed} | Failed: ${failed} | Running: ${running}`
statsEl.textContent = `Passed: ${passed} | Failed: ${failed} | Running: ${running} | Pending: ${pending}`
}
}
@@ -80,11 +81,12 @@ export class TestSuiteElement extends HTMLElement {
const passed = completedTests.filter((t) => t.status === 'passed').length
const failed = completedTests.filter((t) => t.status === 'failed').length
const running = completedTests.filter((t) => t.status === 'running').length
const pending = completedTests.filter((t) => t.status === 'pending').length
this.shadow.innerHTML = `
<div class="header">
<h2>${name}</h2>
<div class="stats">Passed: ${passed} | Failed: ${failed} | Running: ${running}</div>
<div class="stats">Passed: ${passed} | Failed: ${failed} | Running: ${running} | Pending: ${pending}</div>
</div>
<div class="tests" id="tests-container"></div>
`
+26 -9
View File
@@ -30,12 +30,14 @@ export class TestRunner {
) => void
): Promise<CompletedTestSuite[]> {
this.isRunning = true
this.completedTestSuites = []
this.completedTestSuites = this.testSuites.map((suite) => ({
name: suite.name,
completedTests: []
}))
for (let i = 0; i < this.testSuites.length; i++) {
const suite = this.testSuites[i]
await this.runTestSuite(suite, i, onUpdate)
}
await Promise.allSettled(
this.testSuites.map((suite, i) => this.runTestSuite(suite, i, onUpdate))
)
this.isRunning = false
return this.completedTestSuites
@@ -49,7 +51,23 @@ export class TestRunner {
currentIndex: number
) => void
): Promise<CompletedTestSuite> {
const completedTests: CompletedTest[] = []
// Seed all tests as pending so every card renders before any run starts.
const completedTests: CompletedTest[] = suite.tests.map((test) => ({
test,
result: false,
error: null,
executionTime: 0,
status: 'pending'
}))
if (onUpdate) {
this.completedTestSuites[suiteIndex] = {
name: suite.name,
completedTests: [...completedTests]
}
onUpdate([...this.completedTestSuites], suiteIndex * 1000)
}
let context: unknown
// Run beforeAll if exists
@@ -62,15 +80,14 @@ export class TestRunner {
const test = suite.tests[i]
const currentIndex = suiteIndex * 1000 + i
// Set status to running
const runningTest: CompletedTest = {
// Flip pending → running
completedTests[i] = {
test,
result: false,
error: null,
executionTime: 0,
status: 'running'
}
completedTests.push(runningTest)
// Notify update
if (onUpdate) {
+5 -2
View File
@@ -22,6 +22,8 @@ import { sendArrTests, sendObjTests } from './testSuites/RequestData'
import { fileUploadTests } from './testSuites/FileUpload'
import { computeTests } from './testSuites/Compute'
import { sasjsRequestTests } from './testSuites/SasjsRequests'
import { specialCaseTests } from './testSuites/SpecialCases'
import { executionTasksTests } from './testSuites/executionTasks'
async function init() {
const appContainer = document.getElementById('app')
@@ -98,13 +100,14 @@ function showTests(
// basicTests(adapter, configTyped.userName || '', configTyped.password || ''),
sendArrTests(adapter, appLoc),
sendObjTests(adapter),
// specialCaseTests(adapter),
specialCaseTests(adapter),
sasjsRequestTests(adapter),
fileUploadTests(adapter)
]
// Add compute tests for SASVIYA only
// Add tests for SASVIYA only
if (adapter.getSasjsConfig().serverType === 'SASVIYA') {
testSuites.push(executionTasksTests(adapter))
testSuites.push(computeTests(adapter, appLoc))
}
+11 -3
View File
@@ -77,7 +77,7 @@ export const basicTests = (
await adapter.logOut()
return await adapter.request(
'common/sendArr',
'services/common/sendArr',
stringData,
undefined,
async () => {
@@ -97,7 +97,11 @@ export const basicTests = (
useComputeApi: false
}
return await adapter.request('common/sendArr', stringData, config)
return await adapter.request(
'services/common/sendArr',
stringData,
config
)
},
assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1
@@ -112,7 +116,11 @@ export const basicTests = (
debug: true
}
return await adapter.request('common/sendArr', stringData, config)
return await adapter.request(
'services/common/sendArr',
stringData,
config
)
},
assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1
+11 -4
View File
@@ -11,7 +11,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Compute API request',
description: 'Should run the request with compute API approach',
test: async () => {
return await adapter.request('common/sendArr', stringData)
return await adapter.request('services/common/sendArr', stringData)
},
assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1
@@ -25,7 +25,11 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
useComputeApi: false
}
return await adapter.request('common/sendArr', stringData, config)
return await adapter.request(
'services/common/sendArr',
stringData,
config
)
},
assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1
@@ -36,7 +40,10 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
description: 'Should start a compute job and return the session',
test: () => {
const data: any = { table1: [{ col1: 'first col value' }] }
return adapter.startComputeJob(`${appLoc}/common/sendArr`, data)
return adapter.startComputeJob(
`${appLoc}/services/common/sendArr`,
data
)
},
assertion: (res: any) => {
const expectedProperties = ['id', 'applicationName', 'attributes']
@@ -49,7 +56,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
test: () => {
const data: any = { table1: [{ col1: 'first col value' }] }
return adapter.startComputeJob(
`${appLoc}/common/sendArr`,
`${appLoc}/services/common/sendArr`,
data,
{},
undefined,
+5 -1
View File
@@ -22,7 +22,11 @@ export const fileUploadTests = (adapter: SASjs): TestSuite => ({
}
]
return adapter.uploadFile('common/sendMacVars', filesToUpload, null)
return adapter.uploadFile(
'services/common/sendMacVars',
filesToUpload,
null
)
},
assertion: (response: any) =>
(response.macvars as any[]).findIndex(
+29 -21
View File
@@ -53,7 +53,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Absolute paths',
description: 'Should work with absolute paths to SAS jobs',
test: () => {
return adapter.request(`${appLoc}/common/sendArr`, stringData)
return adapter.request(`${appLoc}/services/common/sendArr`, stringData)
},
assertion: (res: any) => {
return res.table1[0][0] === stringData.table1[0].col1
@@ -63,7 +63,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Single string value',
description: 'Should send an array with a single string value',
test: () => {
return adapter.request('common/sendArr', stringData)
return adapter.request('services/common/sendArr', stringData)
},
assertion: (res: any) => {
return res.table1[0][0] === stringData.table1[0].col1
@@ -74,7 +74,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
description:
'Should send an array with a long string value under 32765 characters',
test: () => {
return adapter.request('common/sendArr', getLongStringData())
return adapter.request('services/common/sendArr', getLongStringData())
},
assertion: (res: any) => {
const longStringData = getLongStringData()
@@ -87,7 +87,9 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
'Should error out with long string values over 32765 characters',
test: () => {
const data = getLongStringData(32767)
return adapter.request('common/sendArr', data).catch((e: any) => e)
return adapter
.request('services/common/sendArr', data)
.catch((e: any) => e)
},
assertion: (error: any) => {
return !!error && !!error.error && !!error.error.message
@@ -97,7 +99,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Single numeric value',
description: 'Should send an array with a single numeric value',
test: () => {
return adapter.request('common/sendArr', numericData)
return adapter.request('services/common/sendArr', numericData)
},
assertion: (res: any) => {
return res.table1[0][0] === numericData.table1[0].col1
@@ -107,7 +109,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Multiple columns',
description: 'Should handle data with multiple columns',
test: () => {
return adapter.request('common/sendArr', multiColumnData)
return adapter.request('services/common/sendArr', multiColumnData)
},
assertion: (res: any) => {
return (
@@ -122,7 +124,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Multiple rows with nulls',
description: 'Should handle data with multiple rows with null values',
test: () => {
return adapter.request('common/sendArr', multipleRowsWithNulls)
return adapter.request('services/common/sendArr', multipleRowsWithNulls)
},
assertion: (res: any) => {
let result = true
@@ -148,7 +150,10 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Multiple columns with nulls',
description: 'Should handle data with multiple columns with null values',
test: () => {
return adapter.request('common/sendArr', multipleColumnsWithNulls)
return adapter.request(
'services/common/sendArr',
multipleColumnsWithNulls
)
},
assertion: (res: any) => {
let result = true
@@ -184,7 +189,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'1InvalidTable': [{ col1: 42 }]
}
return adapter
.request('common/sendObj', invalidData)
.request('services/common/sendObj', invalidData)
.catch((e: any) => e)
},
assertion: (error: any) =>
@@ -198,7 +203,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'an invalidTable': [{ col1: 42 }]
}
return adapter
.request('common/sendObj', invalidData)
.request('services/common/sendObj', invalidData)
.catch((e: any) => e)
},
assertion: (error: any) =>
@@ -212,7 +217,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'anInvalidTable#': [{ col1: 42 }]
}
return adapter
.request('common/sendObj', invalidData)
.request('services/common/sendObj', invalidData)
.catch((e: any) => e)
},
assertion: (error: any) =>
@@ -227,7 +232,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
}
return adapter
.request('common/sendObj', invalidData)
.request('services/common/sendObj', invalidData)
.catch((e: any) => e)
},
assertion: (error: any) =>
@@ -241,7 +246,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
inData: [[{ data: 'value' }]]
}
return adapter
.request('common/sendObj', invalidData)
.request('services/common/sendObj', invalidData)
.catch((e: any) => e)
},
assertion: (error: any) =>
@@ -251,7 +256,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Single string value',
description: 'Should send an object with a single string value',
test: () => {
return adapter.request('common/sendObj', stringData)
return adapter.request('services/common/sendObj', stringData)
},
assertion: (res: any) => {
return res.table1[0].COL1 === stringData.table1[0].col1
@@ -262,7 +267,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
description:
'Should send an object with a long string value under 32765 characters',
test: () => {
return adapter.request('common/sendObj', getLongStringData())
return adapter.request('services/common/sendObj', getLongStringData())
},
assertion: (res: any) => {
const longStringData = getLongStringData()
@@ -275,7 +280,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'Should error out with long string values over 32765 characters',
test: () => {
return adapter
.request('common/sendObj', getLongStringData(32767))
.request('services/common/sendObj', getLongStringData(32767))
.catch((e: any) => e)
},
assertion: (error: any) => {
@@ -286,7 +291,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Single numeric value',
description: 'Should send an object with a single numeric value',
test: () => {
return adapter.request('common/sendObj', numericData)
return adapter.request('services/common/sendObj', numericData)
},
assertion: (res: any) => {
return res.table1[0].COL1 === numericData.table1[0].col1
@@ -297,7 +302,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Large data volume',
description: 'Should send an object with a large amount of data',
test: () => {
return adapter.request('common/sendObj', getLargeObjectData())
return adapter.request('services/common/sendObj', getLargeObjectData())
},
assertion: (res: any) => {
const data = getLargeObjectData()
@@ -308,7 +313,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple columns',
description: 'Should handle data with multiple columns',
test: () => {
return adapter.request('common/sendObj', multiColumnData)
return adapter.request('services/common/sendObj', multiColumnData)
},
assertion: (res: any) => {
return (
@@ -323,7 +328,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple rows with nulls',
description: 'Should handle data with multiple rows with null values',
test: () => {
return adapter.request('common/sendObj', multipleRowsWithNulls)
return adapter.request('services/common/sendObj', multipleRowsWithNulls)
},
assertion: (res: any) => {
let result = true
@@ -349,7 +354,10 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple columns with nulls',
description: 'Should handle data with multiple columns with null values',
test: () => {
return adapter.request('common/sendObj', multipleColumnsWithNulls)
return adapter.request(
'services/common/sendObj',
multipleColumnsWithNulls
)
},
assertion: (res: any) => {
let result = true
+2 -2
View File
@@ -11,7 +11,7 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
title: 'WORK tables',
description: 'Should get WORK tables after request',
test: async () => {
return adapter.request('common/sendArr', data)
return adapter.request('services/common/sendArr', data)
},
assertion: () => {
const requests = adapter.getSasRequests()
@@ -28,7 +28,7 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
// 'Should make an error and capture log, in the same time it is testing if debug override is working',
// test: async () => {
// return adapter
// .request('common/makeErr', data, { debug: true })
// .request('services/common/makeErr', data, { debug: true })
// .catch(() => {
// const sasRequests = adapter.getSasRequests()
// const makeErrRequest: any =
+17 -14
View File
@@ -111,7 +111,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Common special characters',
description: 'Should handle common special characters',
test: () => {
return adapter.request('common/sendArr', specialCharData)
return adapter.request('services/common/sendArr', specialCharData)
},
assertion: (res: any) => {
return (
@@ -133,7 +133,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Other special characters',
description: 'Should handle other special characters',
test: () => {
return adapter.request('common/sendArr', moreSpecialCharData)
return adapter.request('services/common/sendArr', moreSpecialCharData)
},
assertion: (res: any) => {
// If sas session is `latin9` or `wlatin1` we can't process the special characters,
@@ -169,7 +169,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Wide table with sendArr',
description: 'Should handle data with 10000 columns',
test: () => {
return adapter.request('common/sendArr', getWideData())
return adapter.request('services/common/sendArr', getWideData())
},
assertion: (res: any) => {
const data = getWideData()
@@ -185,7 +185,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Wide table with sendObj',
description: 'Should handle data with 10000 columns',
test: () => {
return adapter.request('common/sendObj', getWideData())
return adapter.request('services/common/sendObj', getWideData())
},
assertion: (res: any) => {
const data = getWideData()
@@ -202,7 +202,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple tables',
description: 'Should handle data with 100 tables',
test: () => {
return adapter.request('common/sendArr', getTables())
return adapter.request('services/common/sendArr', getTables())
},
assertion: (res: any) => {
const data = getTables()
@@ -222,7 +222,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Large dataset with sendObj',
description: 'Should handle 5mb of data',
test: () => {
return adapter.request('common/sendObj', getLargeDataset())
return adapter.request('services/common/sendObj', getLargeDataset())
},
assertion: (res: any) => {
const data = getLargeDataset()
@@ -237,7 +237,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Large dataset with sendArr',
description: 'Should handle 5mb of data',
test: () => {
return adapter.request('common/sendArr', getLargeDataset())
return adapter.request('services/common/sendArr', getLargeDataset())
},
assertion: (res: any) => {
const data = getLargeDataset()
@@ -253,7 +253,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Error and _csrf tables with sendArr',
description: 'Should handle error and _csrf tables',
test: () => {
return adapter.request('common/sendArr', errorAndCsrfData)
return adapter.request('services/common/sendArr', errorAndCsrfData)
},
assertion: (res: any) => {
return (
@@ -272,7 +272,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Error and _csrf tables with sendObj',
description: 'Should handle error and _csrf tables',
test: () => {
return adapter.request('common/sendObj', errorAndCsrfData)
return adapter.request('services/common/sendObj', errorAndCsrfData)
},
assertion: (res: any) => {
return (
@@ -300,7 +300,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
}
return await adapter.request(
'common/sendArr',
'services/common/sendArr',
stringData,
config,
undefined,
@@ -319,7 +319,10 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Special missing values',
description: 'Should support special missing values',
test: () => {
return adapter.request('common/sendObj', testTableWithSpecialNumeric)
return adapter.request(
'services/common/sendObj',
testTableWithSpecialNumeric
)
},
assertion: (res: any) => {
let assertionRes = true
@@ -365,7 +368,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
'Should support special missing values, when one row is send',
test: () => {
return adapter.request(
'common/sendObj',
'services/common/sendObj',
testTableWithSpecialNumericOneRow
)
},
@@ -413,7 +416,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
'Should support special missing values, when LOWERCASE value is sent',
test: () => {
return adapter.request(
'common/sendObj',
'services/common/sendObj',
testTableWithSpecialNumericLowercase
)
},
@@ -469,7 +472,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
'Should support special missing values, when one row is send (On VIYA Web Approach)',
test: () => {
return adapter.request(
'common/sendObj',
'services/common/sendObj',
testTableWithSpecialNumericOneRow,
{ useComputeApi: undefined }
)
@@ -0,0 +1,126 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import SASjs from '@sasjs/adapter'
import type { TestSuite } from '../types'
const tableData: any = { table1: [{ col1: 'first col value' }] }
const fileData: any = { table1: [{ col1: 'value with ; semicolon' }] }
const multiTableData: any = {
table1: [{ col1: 'first col value' }],
table2: [{ col2: 'second table value' }]
}
const multiFileData: any = {
table1: [{ col1: 'value with ; semicolon' }],
table2: [{ col2: 'another; value' }]
}
const taskConfig: any = { useComputeApi: null, runAsTask: true }
const noTaskConfig: any = { useComputeApi: null, runAsTask: false }
export const executionTasksTests = (adapter: SASjs): TestSuite => ({
name: 'runAsTask behaviour',
tests: [
{
title: 'no inputs (runAsTask=false)',
description: 'no payload, runAsTask explicitly disabled',
test: () =>
adapter
.request('services/common/sendArr', null, noTaskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'no inputs (runAsTask=true)',
description: 'no payload, runAsTask=true via config',
test: () =>
adapter
.request('services/common/sendArr', null, taskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'one input table (runAsTask=false)',
description: 'single table payload, runAsTask explicitly disabled',
test: () =>
adapter
.request('services/common/sendArr', tableData, noTaskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'one input table (runAsTask=true)',
description: 'single table payload, runAsTask=true via config',
test: () =>
adapter
.request('services/common/sendArr', tableData, taskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'multiple input tables (runAsTask=false)',
description: 'multi-table payload, runAsTask explicitly disabled',
test: () =>
adapter
.request('services/common/sendArr', multiTableData, noTaskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'multiple input tables (runAsTask=true)',
description: 'multi-table payload, runAsTask=true via config',
test: () =>
adapter
.request('services/common/sendArr', multiTableData, taskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'semicolon payload, single table, blob path (runAsTask=false)',
description: 'semicolon payload routes through blob path, runAsTask off',
test: () =>
adapter
.request('services/common/sendArr', fileData, noTaskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'semicolon payload, single table, blob path (runAsTask=true)',
description:
'semicolon payload (single table) routes through blob path, runAsTask=true',
test: () =>
adapter
.request('services/common/sendArr', fileData, taskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'semicolon payload, multi-table, blob path (runAsTask=false)',
description:
'semicolon payload (multi-table) routes through blob path, runAsTask off',
test: () =>
adapter
.request('services/common/sendArr', multiFileData, noTaskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
},
{
title: 'semicolon payload, multi-table, blob path (runAsTask=true)',
description:
'semicolon payload (multi-table) routes through blob path, runAsTask=true',
test: () =>
adapter
.request('services/common/sendArr', multiFileData, taskConfig)
.then((res: any) => ({ ok: true, res }))
.catch((e: any) => ({ ok: false, error: e })),
assertion: (res: any) => res?.ok === true
}
]
})
+16 -11
View File
@@ -32,16 +32,18 @@ export class ContextManager {
return this.defaultLauncherContexts
}
constructor(private serverUrl: string, private requestClient: RequestClient) {
constructor(
private serverUrl: string,
private requestClient: RequestClient
) {
if (serverUrl) isUrl(serverUrl)
}
public async getComputeContexts(accessToken?: string) {
const { result: contexts } = await this.requestClient
.get<{ items: Context[] }>(
`${this.serverUrl}/compute/contexts?limit=10000`,
accessToken
)
.get<{
items: Context[]
}>(`${this.serverUrl}/compute/contexts?limit=10000`, accessToken)
.catch((err) => {
throw prefixMessage(err, 'Error while getting compute contexts. ')
})
@@ -59,10 +61,9 @@ export class ContextManager {
public async getLauncherContexts(accessToken?: string) {
const { result: contexts } = await this.requestClient
.get<{ items: Context[] }>(
`${this.serverUrl}/launcher/contexts?limit=10000`,
accessToken
)
.get<{
items: Context[]
}>(`${this.serverUrl}/launcher/contexts?limit=10000`, accessToken)
.catch((err) => {
throw prefixMessage(err, 'Error while getting launcher contexts. ')
})
@@ -291,7 +292,9 @@ export class ContextManager {
accessToken?: string
): Promise<Context> {
const { result: contexts } = await this.requestClient
.get<{ items: Context[] }>(
.get<{
items: Context[]
}>(
`${this.serverUrl}/compute/contexts?filter=eq(name, "${contextName}")`,
accessToken
)
@@ -332,7 +335,9 @@ export class ContextManager {
authConfig?: AuthConfig
) {
const { result: contexts } = await this.requestClient
.get<{ items: Context[] }>(
.get<{
items: Context[]
}>(
`${this.serverUrl}/compute/contexts?limit=10000`,
authConfig?.access_token
)
+9 -4
View File
@@ -1026,17 +1026,22 @@ export class SASViyaApiClient {
}
files.forEach((fileInfo, index) => {
jobArguments[
`_webin_fileuri${index + 1}`
] = `/files/files/${fileInfo.file.id}`
jobArguments[`_webin_fileuri${index + 1}`] =
`/files/files/${fileInfo.file.id}`
jobArguments[`_webin_name${index + 1}`] = fileInfo.tableName
})
// Viya JES requires arguments to be Map<String,String>; coerce booleans/numbers.
const stringifiedArguments: { [key: string]: string } = {}
for (const k of Object.keys(jobArguments)) {
stringifiedArguments[k] = String(jobArguments[k])
}
const postJobRequestBody = {
name: `exec-${jobName}`,
description: 'Powered by SASjs',
jobDefinition,
arguments: jobArguments
arguments: stringifiedArguments
}
const { result: postedJob } = await this.requestClient.post<Job>(
+2 -2
View File
@@ -1063,8 +1063,8 @@ export default class SASjs {
this.sasjsConfig.serverType === ServerType.SasViya
? this.sasjsConfig.pathSASViya
: this.sasjsConfig.serverType === ServerType.Sas9
? this.sasjsConfig.pathSAS9
: this.sasjsConfig.pathSASJS
? this.sasjsConfig.pathSAS9
: this.sasjsConfig.pathSASJS
this.authManager = new AuthManager(
this.sasjsConfig.serverUrl,
+2 -3
View File
@@ -125,9 +125,8 @@ export async function executeOnComputeApi(
jobVariables['_webin_file_count'] = files.length
files.forEach((fileInfo, index) => {
jobVariables[
`_webin_fileuri${index + 1}`
] = `/files/files/${fileInfo.file.id}`
jobVariables[`_webin_fileuri${index + 1}`] =
`/files/files/${fileInfo.file.id}`
jobVariables[`_webin_name${index + 1}`] = fileInfo.tableName
})
} else {
+2 -2
View File
@@ -683,8 +683,8 @@ const mockSimplePoll = (runningCount = 2) => {
count === 0
? 'pending'
: count <= runningCount
? 'running'
: 'completed',
? 'running'
: 'completed',
etag: '',
status: 200
})
+14
View File
@@ -23,6 +23,20 @@ describe('uploadTables', () => {
)
})
it('should skip $tablename formats metadata keys', async () => {
const data = {
tablewith2cols2rows: [{ col1: 'val1', specialMissingsCol: 'A' }],
$tablewith2cols2rows: { formats: { specialMissingsCol: 'best.' } }
}
const files = await uploadTables(requestClient, data, 't0k3n')
expect(files).toEqual([
{ tableName: 'tablewith2cols2rows', file: 'test-file' }
])
expect(requestClient.uploadFile).toHaveBeenCalledTimes(1)
})
it('should throw an error when the CSV exceeds the maximum length', async () => {
const data = { foo: 'bar' }
jest
+5 -1
View File
@@ -1,6 +1,6 @@
import { prefixMessage } from '@sasjs/utils/error'
import { RequestClient } from '../../request/RequestClient'
import { convertToCSV } from '../../utils/convertToCsv'
import { convertToCSV, isFormatsTable } from '../../utils/convertToCsv'
/**
* Uploads tables to SAS as specially formatted CSVs.
@@ -18,6 +18,10 @@ export async function uploadTables(
const uploadedFiles = []
for (const tableName in data) {
// $tablename keys carry only column-format metadata for the matching
// tablename payload; they must not be uploaded as separate files.
if (isFormatsTable(tableName)) continue
const csv = convertToCSV(data, tableName)
if (csv === 'ERROR: LARGE STRING LENGTH') {
throw new Error(
+5 -5
View File
@@ -27,8 +27,8 @@ export class AuthManager {
this.serverType === ServerType.Sas9
? '/SASLogon/logout?'
: this.serverType === ServerType.SasViya
? '/SASLogon/logout.do?'
: '/SASLogon/logout'
? '/SASLogon/logout.do?'
: '/SASLogon/logout'
this.redirectedLoginUrl = this.serverUrl + this.redirectedLoginUrl
}
@@ -269,8 +269,8 @@ export class AuthManager {
this.serverType === ServerType.SasViya
? `${this.serverUrl}/identities/users/@currentUser`
: this.serverType === ServerType.Sas9
? `${this.serverUrl}/SASStoredProcess`
: `${this.serverUrl}/SASjsApi/session`
? `${this.serverUrl}/SASStoredProcess`
: `${this.serverUrl}/SASjsApi/session`
const { result: loginResponse } = await this.requestClient
.get<string>(url, undefined, 'text/plain')
@@ -375,7 +375,7 @@ export class AuthManager {
*
*/
public async logOut() {
this.requestClient.resetInMemoryAuthState()
this.requestClient.clearCsrfTokens()
return this.requestClient.get(this.logoutUrl, undefined).then(() => true)
}
+1 -1
View File
@@ -10,7 +10,7 @@ describe('openWebPage', () => {
describe('window.open is not blocked', () => {
const mockedOpen = jest
.fn()
.mockImplementation(() => ({} as unknown as Window))
.mockImplementation(() => ({}) as unknown as Window)
const originalOpen = window.open
beforeAll(() => {
+7
View File
@@ -11,6 +11,13 @@ export const generateTableUploadForm = (
let tableCounter = 0
for (const tableName in data) {
if (
isFormatsTable(tableName) &&
Object.keys(data).includes(tableName.replace(/^\$/, ''))
) {
continue
}
tableCounter++
// Formats table should not be sent as part of 'sasjs_tables'
@@ -0,0 +1,71 @@
import { generateTableUploadForm } from '../generateTableUploadForm'
import { convertToCSV } from '../../utils/convertToCsv'
import NodeFormData from 'form-data'
describe('generateTableUploadForm', () => {
it('should skip formats table and emit single sasjs1data for paired data + $data', () => {
const tableName = 'jsdata'
const data: { [key: string]: any } = {
[tableName]: [
{ var1: 'string', var2: 232 },
{ var1: 'string', var2: 233 }
],
[`$${tableName}`]: { formats: { var1: '$char12.', var2: 'best.' } }
}
const expectedCsv = convertToCSV(data, tableName)
const formData = new NodeFormData()
const { requestParams } = generateTableUploadForm(formData, data)
expect(requestParams.sasjs_tables).toBe(tableName)
expect(requestParams.sasjs1data).toBe(expectedCsv)
expect(requestParams.sasjs2data).toBeUndefined()
})
it('should number sequentially across multiple tables w/ paired formats', () => {
const data: { [key: string]: any } = {
tableA: [{ a: 1 }],
$tableA: { formats: { a: 'best.' } },
tableB: [{ b: 'x' }],
$tableB: { formats: { b: '$char1.' } }
}
const expectedCsvA = convertToCSV(data, 'tableA')
const expectedCsvB = convertToCSV(data, 'tableB')
const formData = new NodeFormData()
const { requestParams } = generateTableUploadForm(formData, data)
expect(requestParams.sasjs_tables).toBe('tableA tableB')
expect(requestParams.sasjs1data).toBe(expectedCsvA)
expect(requestParams.sasjs2data).toBe(expectedCsvB)
expect(requestParams.sasjs3data).toBeUndefined()
})
it('should throw if string value exceeds 32765 chars', () => {
const formData = new NodeFormData()
const data = { testTable: [{ var1: 'z'.repeat(32766) }] }
expect(() => generateTableUploadForm(formData, data)).toThrow(
new Error(
'The max length of a string value in SASjs is 32765 characters.'
)
)
})
it('should append chunks to formData when csv exceeds 16k', () => {
const tableName = 'big'
const data = { [tableName]: [{ var1: 'z'.repeat(16001) }] }
const formData = new NodeFormData()
const appendSpy = jest.spyOn(formData, 'append')
const { requestParams } = generateTableUploadForm(formData, data)
expect(requestParams.sasjs_tables).toBe(tableName)
expect(requestParams.sasjs1data).toBeUndefined()
expect(appendSpy).toHaveBeenCalled()
expect(appendSpy.mock.calls.every(([key]) => key === 'sasjs1data')).toBe(
true
)
})
})
+4 -1
View File
@@ -8,7 +8,10 @@ import {
import { BaseJobExecutor } from './JobExecutor'
export class ComputeJobExecutor extends BaseJobExecutor {
constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
constructor(
serverUrl: string,
private sasViyaApiClient: SASViyaApiClient
) {
super(serverUrl, ServerType.SasViya)
}
+4 -1
View File
@@ -10,7 +10,10 @@ import { BaseJobExecutor } from './JobExecutor'
import { appendExtraResponseAttributes } from '../utils'
export class JesJobExecutor extends BaseJobExecutor {
constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
constructor(
serverUrl: string,
private sasViyaApiClient: SASViyaApiClient
) {
super(serverUrl, ServerType.SasViya)
}
+4 -2
View File
@@ -17,7 +17,10 @@ export interface JobExecutor {
}
export abstract class BaseJobExecutor implements JobExecutor {
constructor(protected serverUrl: string, protected serverType: ServerType) {}
constructor(
protected serverUrl: string,
protected serverType: ServerType
) {}
private waitingRequests: ExecuteFunction[] = []
@@ -52,7 +55,6 @@ export abstract class BaseJobExecutor implements JobExecutor {
if (config.debug) {
requestParams['_omittextlog'] = 'false'
requestParams['_omitSessionResults'] = 'false'
requestParams['_debug'] = 131
}
+78 -6
View File
@@ -16,9 +16,11 @@ import { SASViyaApiClient } from '../SASViyaApiClient'
import {
isRelativePath,
parseSasViyaDebugResponse,
parseSasViyaLogDebugResponse,
appendExtraResponseAttributes,
parseWeboutResponse,
getFormData
getFormData,
isNode
} from '../utils'
import { BaseJobExecutor } from './JobExecutor'
@@ -101,6 +103,10 @@ export class WebJobExecutor extends BaseJobExecutor {
apiUrl += config.contextName?.trim()
? `&_contextname=${encodeURIComponent(config.contextName)}`
: ''
if (config.runAsTask === true) {
apiUrl += '&_executionTasks=true'
}
}
let requestParams = {
@@ -113,6 +119,26 @@ export class WebJobExecutor extends BaseJobExecutor {
*/
let formData = getFormData()
// FIXME(viya - SAS Track CS0409737): remove when Viya stops rejecting empty multipart on
// _executionTasks=true. Dummy file keeps the body non-empty
const hasExecutionTasksFlag = config.runAsTask === true
// Move debug params to URL for viya; viya seems to honor them more
// reliably in the query string than the multipart body.
if (
hasExecutionTasksFlag &&
config.debug &&
config.serverType === ServerType.SasViya
) {
const debugKeys = ['_debug', '_omitSessionResults']
debugKeys.forEach((key) => {
if (requestParams[key] !== undefined) {
apiUrl += `&${key}=${encodeURIComponent(requestParams[key])}`
delete requestParams[key]
}
})
}
if (data) {
const stringifiedData = JSON.stringify(data)
if (
@@ -133,10 +159,21 @@ export class WebJobExecutor extends BaseJobExecutor {
generateTableUploadForm(formData, data)
formData = newFormData
requestParams = { ...requestParams, ...params }
if (
config.serverType === ServerType.SasViya &&
hasExecutionTasksFlag
) {
addDummyFile(formData)
}
} catch (e: any) {
return Promise.reject(new ErrorResponse(e?.message, e))
}
}
} else {
if (config.serverType === ServerType.SasViya && hasExecutionTasksFlag) {
addDummyFile(formData)
}
}
for (const key in requestParams) {
@@ -168,11 +205,14 @@ export class WebJobExecutor extends BaseJobExecutor {
if (config.debug) {
switch (this.serverType) {
case ServerType.SasViya:
jsonResponse = await parseSasViyaDebugResponse(
res.result,
this.requestClient,
this.serverUrl
)
jsonResponse =
config.useComputeApi === null && config.runAsTask === true
? await parseSasViyaLogDebugResponse(res.result)
: await parseSasViyaDebugResponse(
res.result,
this.requestClient,
this.serverUrl
)
break
case ServerType.Sas9:
jsonResponse =
@@ -231,6 +271,23 @@ export class WebJobExecutor extends BaseJobExecutor {
return requestPromise
}
protected getRequestParams(config: any): any {
const requestParams = super.getRequestParams(config)
// FIXME(viya - possible issue with default debug flags)
// runAsTask on Viya: use _debug=128 (not 131) and omit _omittextlog
if (
config.debug &&
config.serverType === ServerType.SasViya &&
config.runAsTask === true
) {
requestParams['_debug'] = 128
delete requestParams['_omittextlog']
}
return requestParams
}
private async getJobUri(sasJob: string) {
if (!this.sasViyaApiClient) return ''
let uri = ''
@@ -263,3 +320,18 @@ export class WebJobExecutor extends BaseJobExecutor {
return uri
}
}
function addDummyFile(formData: NodeFormData | FormData) {
if (isNode()) {
;(formData as NodeFormData).append('_sasjs_noop', '', {
filename: '_sasjs_noop.txt',
contentType: 'text/plain'
})
} else {
;(formData as FormData).append(
'_sasjs_noop',
new Blob([''], { type: 'text/plain' }),
'_sasjs_noop.txt'
)
}
}
@@ -0,0 +1,146 @@
import NodeFormData from 'form-data'
import { ServerType } from '@sasjs/utils/types'
import { WebJobExecutor } from '../WebJobExecutor'
import { RequestClient } from '../../request/RequestClient'
import { SASViyaApiClient } from '../../SASViyaApiClient'
describe('WebJobExecutor runAsTask behaviour', () => {
const serverUrl = 'https://sample.server.com'
const jobsPath = '/SASJobExecution'
const makeExecutor = (serverType: ServerType = ServerType.SasViya) => {
const requestClient = new RequestClient(serverUrl)
const sasViyaApiClient = {
getJobsInFolder: async () => []
} as unknown as SASViyaApiClient
const executor = new WebJobExecutor(
serverUrl,
serverType,
jobsPath,
requestClient,
sasViyaApiClient
)
const postSpy = jest
.spyOn(requestClient, 'post')
.mockResolvedValue({ result: { table1: [] }, etag: '' } as any)
jest.spyOn(requestClient, 'appendRequest').mockImplementation()
return { executor, postSpy }
}
const baseConfig = {
serverUrl,
serverType: ServerType.SasViya,
appLoc: '/Public/app',
useComputeApi: false,
debug: false
}
it('sends table data in body (runAsTask=false)', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute(
'services/common/sendArr',
{ table1: [{ col1: 'v' }] },
{ ...baseConfig, runAsTask: false }
)
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
expect(apiUrl).not.toContain('_executionTasks=true')
expect(body).toBeInstanceOf(NodeFormData)
expect(contentType).toMatch(/^multipart\/form-data/)
})
it('uploads as file when payload has semicolons (runAsTask=false)', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute(
'services/common/sendArr',
{ table1: [{ col1: 'has; semicolon' }] },
{ ...baseConfig, runAsTask: false }
)
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
expect(apiUrl).not.toContain('_executionTasks=')
expect(body).toBeInstanceOf(NodeFormData)
expect(contentType).toMatch(/^multipart\/form-data/)
})
it('appends &_executionTasks=true to URL when runAsTask=true and no data', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute('services/common/sendArr', null, {
...baseConfig,
runAsTask: true
})
const [apiUrl] = postSpy.mock.calls[0]
expect(apiUrl).toContain('&_executionTasks=true')
})
it('appends &_executionTasks=true and sends table data when runAsTask=true with one input table', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute(
'services/common/sendArr',
{ table1: [{ col1: 'v' }] },
{ ...baseConfig, runAsTask: true }
)
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
expect(apiUrl).toContain('&_executionTasks=true')
expect(body).toBeInstanceOf(NodeFormData)
expect(contentType).toMatch(/^multipart\/form-data/)
const dump = (body as NodeFormData).getBuffer().toString()
expect(dump).toContain('name="sasjs_tables"')
expect(dump).toContain('name="sasjs1data"')
})
it('appends &_executionTasks=true to URL when runAsTask=true with multiple input tables', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute(
'services/common/sendArr',
{ table1: [{ col1: 'v' }], table2: [{ col2: 'w' }] },
{ ...baseConfig, runAsTask: true }
)
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
expect(apiUrl).toContain('&_executionTasks=true')
expect(body).toBeInstanceOf(NodeFormData)
expect(contentType).toMatch(/^multipart\/form-data/)
const dump = (body as NodeFormData).getBuffer().toString()
expect(dump).toContain('name="sasjs_tables"')
expect(dump).toMatch(/table1\s+table2/)
})
it('uploads as file when runAsTask=true and payload has semicolons', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute(
'services/common/sendArr',
{ table1: [{ col1: 'has; semicolon' }] },
{ ...baseConfig, runAsTask: true }
)
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
expect(apiUrl).toContain('&_executionTasks=true')
expect(body).toBeInstanceOf(NodeFormData)
expect(contentType).toMatch(/^multipart\/form-data/)
const dump = (body as NodeFormData).getBuffer().toString()
expect(dump).toContain('filename="table1.csv"')
expect(dump).toContain('Content-Type: application/csv')
})
it('does NOT append _executionTasks=true to URL when runAsTask=false', async () => {
const { executor, postSpy } = makeExecutor()
await executor.execute(
'services/common/sendArr',
{ table1: [{ col1: 'v' }] },
{ ...baseConfig, runAsTask: false }
)
const [apiUrl] = postSpy.mock.calls[0]
expect(apiUrl).not.toContain('_executionTasks=true')
})
})
+5 -175
View File
@@ -28,9 +28,6 @@ import {
import { InvalidSASjsCsrfError } from '../types/errors/InvalidSASjsCsrfError'
import { inspect } from 'util'
const getLogger = () =>
(typeof process !== 'undefined' && process.logger) || console
export class RequestClient implements HttpClient {
private requests: SASjsRequest[] = []
private requestsLimit: number = 10
@@ -40,7 +37,6 @@ export class RequestClient implements HttpClient {
protected csrfToken: CsrfToken = { headerName: '', value: '' }
protected fileUploadCsrfToken: CsrfToken | undefined
protected httpClient!: AxiosInstance
private isRecoveringFromNetworkError = false
constructor(
protected baseUrl: string,
@@ -81,36 +77,6 @@ export class RequestClient implements HttpClient {
localStorage.setItem('refreshToken', '')
}
public resetInMemoryAuthState() {
const logger = getLogger()
const clearedCookies: string[] = []
this.clearCsrfTokens()
if (typeof localStorage !== 'undefined') {
this.clearLocalStorageTokens()
}
if (typeof document !== 'undefined') {
clearedCookies.push(...this.clearAllCookies())
}
logger.warn('[resetInMemoryAuthState] cleared', {
cookies: clearedCookies,
localStorage: typeof localStorage !== 'undefined'
})
}
private clearAllCookies(): string[] {
const cookies = document.cookie.split(';')
const cleared: string[] = []
for (const cookie of cookies) {
const name = cookie.split('=')[0].trim()
if (!name) continue
document.cookie = `${name}=; Max-Age=0; Path=/;`
cleared.push(name)
}
return cleared
}
public getBaseUrl() {
return this.httpClient.defaults.baseURL || ''
}
@@ -388,14 +354,9 @@ export class RequestClient implements HttpClient {
const csrfTokenKey = Object.keys(params).find((k) =>
k?.toLowerCase().includes('csrf')
)
const logger = getLogger()
if (csrfTokenKey) {
this.csrfToken.value = params[csrfTokenKey]
this.csrfToken.headerName = this.csrfToken.headerName || 'x-csrf-token'
logger.warn('[authorize] CSRF from form', {
headerName: this.csrfToken.headerName
})
}
const formData = new FormData()
@@ -410,23 +371,15 @@ export class RequestClient implements HttpClient {
throw new Error('Auth Form URL is null or undefined.')
}
logger.warn('[authorize] posting to', { authUrl })
return await this.httpClient
.post(authUrl, formData, {
responseType: 'text',
headers: { Accept: '*/*', 'Content-Type': 'text/plain' }
})
.then((res) => {
logger.warn('[authorize] success', { status: res.status })
return res.data
})
.then((res) => res.data)
.catch((error) => {
logger.error('[authorize] failed', {
code: error?.code,
status: error?.response?.status,
message: error?.message
})
const logger = process.logger || console
logger.error(error)
})
}
@@ -625,16 +578,9 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
protected parseAndSetCsrfToken = (response: AxiosResponse) => {
const token = this.parseCsrfToken(response)
const logger = getLogger()
if (token) {
this.csrfToken = token
logger.warn('[parseAndSetCsrfToken] set', {
headerName: token.headerName,
hasValue: !!token.value
})
} else {
logger.warn('[parseAndSetCsrfToken] no token found in response')
}
}
@@ -654,11 +600,6 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
}
}
private logHandleError(step: string, details?: Record<string, any>) {
const logger = getLogger()
logger.warn(`[handleError] ${step}`, details || '')
}
protected handleError = async (
e: any,
callback: any,
@@ -666,19 +607,7 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
) => {
const response = e.response as AxiosResponse
this.logHandleError('entered', {
errorType: e?.constructor?.name,
code: e?.code,
status: response?.status,
url: e?.config?.url || response?.config?.url,
hasResponse: !!response,
isRecovering: this.isRecoveringFromNetworkError
})
if (e instanceof AuthorizeError) {
this.logHandleError('AuthorizeError — fetching confirmUrl', {
confirmUrl: e.confirmUrl
})
const res = await this.httpClient
.get(e.confirmUrl, {
responseType: 'text',
@@ -688,24 +617,13 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
throw prefixMessage(err, 'Error while getting error confirmUrl. ')
})
const needsAuthorize = isAuthorizeFormRequired(res?.data as string)
this.logHandleError(
'AuthorizeError — authorize form required: ' + needsAuthorize
)
if (needsAuthorize) {
if (isAuthorizeFormRequired(res?.data as string)) {
await this.authorize(res.data as string).catch((err) => {
throw prefixMessage(err, 'Error while authorizing request. ')
})
}
this.logHandleError('AuthorizeError — retrying callback')
return await callback().catch((err: any) => {
this.logHandleError('AuthorizeError — callback failed', {
errorType: err?.constructor?.name,
code: err?.code,
message: err?.message
})
throw prefixMessage(
err,
'Error while executing callback in handleError. '
@@ -714,14 +632,12 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
}
if (e instanceof LoginRequiredError) {
this.logHandleError('LoginRequiredError — clearing CSRF and re-throwing')
this.clearCsrfTokens()
throw e
}
if (e instanceof InvalidSASjsCsrfError) {
this.logHandleError('InvalidSASjsCsrfError — re-fetching CSRF cookie')
// Fetching root and creating CSRF cookie
await this.httpClient
.get('/', {
@@ -733,22 +649,13 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
response.data
)?.[1]
this.logHandleError(
'InvalidSASjsCsrfError — cookie found: ' + !!cookie
)
if (cookie) document.cookie = cookie
})
.catch((err) => {
throw prefixMessage(err, 'Error while re-fetching CSRF token.')
})
this.logHandleError('InvalidSASjsCsrfError — retrying callback')
return await callback().catch((err: any) => {
this.logHandleError('InvalidSASjsCsrfError — callback failed', {
errorType: err?.constructor?.name,
code: err?.code,
message: err?.message
})
throw prefixMessage(
err,
'Error while executing callback in handleError. '
@@ -759,20 +666,8 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
if (response?.status === 403 || response?.status === 449) {
this.parseAndSetCsrfToken(response)
const hasToken = !!(this.csrfToken.headerName && this.csrfToken.value)
this.logHandleError('403/449 — parsed CSRF from response', {
hasToken,
headerName: this.csrfToken.headerName
})
if (hasToken) {
this.logHandleError('403/449 — retrying callback with new CSRF')
if (this.csrfToken.headerName && this.csrfToken.value) {
return await callback().catch((err: any) => {
this.logHandleError('403/449 — callback failed', {
errorType: err?.constructor?.name,
code: err?.code,
message: err?.message
})
throw prefixMessage(
err,
'Error while executing callback in handleError. '
@@ -780,9 +675,6 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
})
}
this.logHandleError(
'403/449 — no CSRF in response, throwing original error'
)
throw e
} else if (response?.status === 404) {
throw new NotFoundError(response.config.url!)
@@ -795,68 +687,6 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
throw new CertificateError(e.message)
}
if (
e.isAxiosError &&
!response &&
e.code === 'ERR_NETWORK' &&
!this.isRecoveringFromNetworkError
) {
// Opaque ERR_NETWORK usually means the server rejected stale credentials.
// Wipe in-memory auth state, re-establish session via GET /,
// then retry the original request.
this.logHandleError('ERR_NETWORK — clearing all auth state')
this.resetInMemoryAuthState()
this.isRecoveringFromNetworkError = true
try {
// Re-establish session and CSRF cookie
this.logHandleError('ERR_NETWORK — re-establishing session via GET /')
const rootResponse = await this.httpClient
.get('/', { withXSRFToken: true })
.catch((err) => {
this.logHandleError('ERR_NETWORK — GET / failed', {
code: err?.code,
status: err?.response?.status,
message: err?.message
})
return err.response
})
if (rootResponse?.data) {
const cookie =
/<script>document.cookie = '(XSRF-TOKEN=.*; Max-Age=86400; SameSite=Strict; Path=\/;)'<\/script>/.exec(
rootResponse.data
)?.[1]
if (cookie && typeof document !== 'undefined') {
document.cookie = cookie
this.logHandleError('ERR_NETWORK — XSRF-TOKEN cookie restored')
}
this.parseAndSetCsrfToken(rootResponse)
}
this.logHandleError('ERR_NETWORK — retrying original request')
return await callback()
} catch (retryErr: any) {
// Session could not be recovered — surface LoginRequiredError
this.logHandleError(
'ERR_NETWORK — retry failed, throwing LoginRequiredError',
{
errorType: retryErr?.constructor?.name,
code: retryErr?.code,
message: retryErr?.message
}
)
throw new LoginRequiredError()
} finally {
this.isRecoveringFromNetworkError = false
}
}
this.logHandleError('unhandled — throwing as-is', {
message: e?.message,
code: e?.code
})
if (e.message) throw e
else throw prefixMessage(e, 'Error while handling error. ')
}
-7
View File
@@ -23,13 +23,6 @@ export class Sas9RequestClient extends RequestClient {
}
}
public resetInMemoryAuthState() {
super.resetInMemoryAuthState()
if (this.httpClient.defaults.jar) {
;(this.httpClient.defaults.jar as tough.CookieJar).removeAllCookiesSync()
}
}
public async login(username: string, password: string, jobsPath: string) {
const codeInjectorPath = `/User Folders/${username}/My Folder/sasjs/runner`
if (this.httpClient.defaults.jar) {
+1 -37
View File
@@ -589,42 +589,6 @@ ${resHeaders[0]}: ${resHeaders[1]}${
requestClient['handleError'](error, () => {}, false)
).resolves.toEqual(undefined)
})
it('should clear CSRF and retry once on opaque ERR_NETWORK', async () => {
const networkError = {
isAxiosError: true,
code: 'ERR_NETWORK',
message: 'Network Error'
}
requestClient['csrfToken'] = { headerName: 'h', value: 'v' }
const callback = jest.fn().mockResolvedValue('ok')
await expect(
requestClient['handleError'](networkError, callback)
).resolves.toEqual('ok')
expect(callback).toHaveBeenCalledTimes(1)
expect(requestClient['csrfToken']).toEqual({ headerName: '', value: '' })
})
it('should throw LoginRequiredError if retry also fails with ERR_NETWORK', async () => {
const networkError = {
isAxiosError: true,
code: 'ERR_NETWORK',
message: 'Network Error'
}
const innerHandle = jest.fn(() =>
requestClient['handleError'](networkError, () =>
Promise.reject(networkError)
)
)
await expect(
requestClient['handleError'](networkError, innerHandle)
).rejects.toThrow(LoginRequiredError)
expect(innerHandle).toHaveBeenCalledTimes(1)
})
})
})
@@ -667,7 +631,7 @@ describe('RequestClient - Self Signed Server', () => {
getTokenRequestErrorPrefixResponse(err.message, ServerType.SasViya)
)
expect(rejectionErrorMessage).toEqual(expectedError)
expect(rejectionErrorMessage).toContain(expectedError)
})
it('should response the POST method using insecure flag', async () => {
+8
View File
@@ -79,6 +79,14 @@ export class SASjsConfig {
* may affect browser performance, especially with debug (logs) enabled.
*/
requestHistoryLimit?: number = 10
/**
* Optional setting. When `true`, the request runs as a Viya execution task —
* appends `_executionTasks=true` to the request URL. Only applies to the Viya
* web jobs path, i.e. when `serverType === SASVIYA` AND
* `useComputeApi` is `null`/`undefined`. Has no effect when `useComputeApi`
* is explicitly set to `true` or `false`.
*/
runAsTask?: boolean = false
}
export enum LoginMechanism {
+4 -1
View File
@@ -1,5 +1,8 @@
export class AuthorizeError extends Error {
constructor(public message: string, public confirmUrl: string) {
constructor(
public message: string,
public confirmUrl: string
) {
super(message)
this.name = 'AuthorizeError'
Object.setPrototypeOf(this, AuthorizeError.prototype)
+4 -1
View File
@@ -1,7 +1,10 @@
import { Job } from '../Job'
export class ComputeJobExecutionError extends Error {
constructor(public job: Job, public log: string) {
constructor(
public job: Job,
public log: string
) {
super('Error: Job execution failed')
this.name = 'ComputeJobExecutionError'
Object.setPrototypeOf(this, ComputeJobExecutionError.prototype)
+4 -1
View File
@@ -1,5 +1,8 @@
export class JobStatePollError extends Error {
constructor(id: string, public originalError: Error) {
constructor(
id: string,
public originalError: Error
) {
super(
`Error while polling job state for job ${id}: ${
originalError.message || originalError
+2 -2
View File
@@ -110,8 +110,8 @@ export const convertToCSV = (
longestValueForField
? longestValueForField
: firstFoundType === 'chars'
? '1'
: 'best'
? '1'
: 'best'
}.`
)
}
+1
View File
@@ -15,6 +15,7 @@ export * from './parseGeneratedCode'
export * from './parseSasViyaLog'
export * from './parseSourceCode'
export * from './parseViyaDebugResponse'
export * from './parseViyaLogDebugResponse'
export * from './parseWeboutResponse'
export * from './serialize'
export * from './splitChunks'
+32
View File
@@ -0,0 +1,32 @@
import { getValidJson } from './getValidJson'
import { parseWeboutResponse } from './parseWeboutResponse'
/**
* When querying a Viya job using the Web approach with _DEBUG=128 (used when
* runAsTask is true), the webout JSON is inlined into the response via:
* var blob = new Blob([`{...}`], {type: 'application/json'});
* On abort/error paths the same shape is used but with text/plain and
* weboutBEGIN/END markers around the JSON:
* var blob = new Blob([`>>weboutBEGIN<<\n{...}\n>>weboutEND<<\n`], {type: 'text/plain'});
* No follow-up request is needed — extract and parse the JSON directly.
*/
export const parseSasViyaLogDebugResponse = async (response: any) => {
// If upstream already parsed the response as JSON (object), pass through.
if (typeof response !== 'string') {
return response
}
const blobMatch = response.match(
/new Blob\(\[`([\s\S]*?)`\],\s*\{type:\s*'(?:application\/json|text\/plain)'\}\)/
)
if (!blobMatch) {
throw new Error('Unable to find webout blob in debug log response.')
}
const blobContent = blobMatch[1]
const stripped = blobContent.includes('>>weboutBEGIN<<')
? parseWeboutResponse(blobContent)
: blobContent
return getValidJson(stripped)
}
@@ -0,0 +1,55 @@
import { parseSasViyaLogDebugResponse } from '../parseViyaLogDebugResponse'
describe('parseSasViyaLogDebugResponse', () => {
it('should extract and parse JSON from inline Blob', async () => {
const resultData = { message: 'success' }
const response = `<html><body><script>
var blob = new Blob([\`${JSON.stringify(resultData)}\`], {type: 'application/json'});
</script></body></html>`
const result = await parseSasViyaLogDebugResponse(response)
expect(result).toEqual(resultData)
})
it('should extract and parse multiline JSON from inline Blob', async () => {
const resultData = {
SYSDATE: '13MAY26',
SYSCC: '0',
saslibs: [{ LIBRARYREF: 'FORMATS' }]
}
const response = `<script>
var blob = new Blob([\`{"SYSDATE" : "13MAY26"
,"SYSCC" : "0"
,"saslibs": [{"LIBRARYREF":"FORMATS"}]
}
\`], {type: 'application/json'});
</script>`
const result = await parseSasViyaLogDebugResponse(response)
expect(result).toEqual(resultData)
})
it('should extract and parse JSON wrapped in weboutBEGIN/END (text/plain blob)', async () => {
const resultData = { SYSCC: '1012', SYSERRORTEXT: 'File missing.' }
const response = `<script>
var blob = new Blob([\`>>weboutBEGIN<<
${JSON.stringify(resultData)}
>>weboutEND<<
\`], {type: 'text/plain'});
</script>`
const result = await parseSasViyaLogDebugResponse(response)
expect(result).toEqual(resultData)
})
it('should throw an error if blob is not found', async () => {
const response = `<html><body>No blob here</body></html>`
await expect(parseSasViyaLogDebugResponse(response)).rejects.toThrow(
'Unable to find webout blob in debug log response.'
)
})
})