Compare commits

..
Author SHA1 Message Date
dependabot[bot]andGitHub 85ac7d402d build(deps-dev): bump lodash from 4.17.21 to 4.17.23
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.21 to 4.17.23.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.17.23
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-02-09 20:13:06 +00:00
55 changed files with 6097 additions and 7543 deletions
-5
View File
@@ -14,11 +14,6 @@ script-security 2
keepalive 10 120 keepalive 10 120
remote-cert-tls server remote-cert-tls server
# Route ALL traffic through the VPN (full tunnel)
redirect-gateway def1
# Send DNS through the tunnel so it doesn't leak to your local ISP
dhcp-option DNS 1.1.1.1
# Keys # Keys
ca ca.crt ca ca.crt
cert user.crt cert user.crt
+2 -4
View File
@@ -11,9 +11,8 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false
matrix: matrix:
node-version: [22, 24] node-version: [lts/iron]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@@ -33,7 +32,7 @@ jobs:
${{ runner.os }}-node- ${{ runner.os }}-node-
- name: Check npm audit - name: Check npm audit
run: npm audit --omit=dev --audit-level=low run: npm audit --production --audit-level=low
- name: Install Dependencies - name: Install Dependencies
run: npm ci run: npm ci
@@ -54,7 +53,6 @@ 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 # 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 - name: Generate coverage report
if: matrix.node-version == 22
uses: artiomtr/jest-coverage-report-action@v2.0-rc.2 uses: artiomtr/jest-coverage-report-action@v2.0-rc.2
with: with:
github-token: ${{ secrets.GITHUB_TOKEN }} github-token: ${{ secrets.GITHUB_TOKEN }}
+1 -1
View File
@@ -11,7 +11,7 @@ jobs:
strategy: strategy:
matrix: matrix:
node-version: [22] node-version: [lts/iron]
steps: steps:
- name: Checkout - name: Checkout
+8 -35
View File
@@ -11,45 +11,21 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions:
contents: write
id-token: write # required for npm provenance (trusted publisher)
issues: write # optional: lets @semantic-release/github comment on issues
pull-requests: write # optional: lets @semantic-release/github comment on PRs
strategy: strategy:
matrix: matrix:
node-version: [22] node-version: [lts/iron]
steps: steps:
# Mint a short-lived GitHub App token (bypass-capable) - uses: actions/checkout@v2
- name: Generate token
id: app-token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.APP_PRIVATE_KEY }}
# Checkout using the app token so the release commit can be pushed
- uses: actions/checkout@v4
with:
token: ${{ steps.app-token.outputs.token }}
persist-credentials: true
fetch-depth: 0 # semantic-release needs full history + tags
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4 uses: actions/setup-node@v2
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
registry-url: https://registry.npmjs.org
# Node 22 ships npm 10.x — OIDC trusted publishing needs npm >= 11.5.1 # 2. Restore npm cache manually
- name: Update npm
run: npm install -g npm@latest
# Restore npm cache manually
- name: Restore npm cache - name: Restore npm cache
uses: actions/cache@v4 uses: actions/cache@v3
id: npm-cache id: npm-cache
with: with:
path: ~/.npm path: ~/.npm
@@ -70,13 +46,10 @@ jobs:
run: npm run publishInit run: npm run publishInit
- name: Semantic Release - name: Semantic Release
run: npx semantic-release uses: cycjimmy/semantic-release-action@v3
env: env:
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} # <-- app token, not secrets.GITHUB_TOKEN GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Publish to npm with trusted publisher
if: success()
run: npm publish --access public
- name: Send Matrix message - name: Send Matrix message
run: curl -XPOST -d "{\"msgtype\":\"m.text\", \"body\":\"New version of @sasjs/adapter has been released! \n Please deploy and run 'dctests' with new adapter to make sure everything is still in place.\"}" https://matrix.4gl.io/_matrix/client/r0/rooms/!jRebyiGmHZlpfDwYXN:4gl.io/send/m.room.message?access_token=${{ secrets.MATRIX_TOKEN }} run: curl -XPOST -d "{\"msgtype\":\"m.text\", \"body\":\"New version of @sasjs/adapter has been released! \n Please deploy and run 'dctests' with new adapter to make sure everything is still in place.\"}" https://matrix.4gl.io/_matrix/client/r0/rooms/!jRebyiGmHZlpfDwYXN:4gl.io/send/m.room.message?access_token=${{ secrets.MATRIX_TOKEN }}
+5 -30
View File
@@ -12,7 +12,7 @@ jobs:
strategy: strategy:
matrix: matrix:
node-version: [22] node-version: [lts/iron]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@@ -86,40 +86,17 @@ jobs:
- name: install pm2 - name: install pm2
run: npm i -g pm2 run: npm i -g pm2
- name: Diagnose VPN connectivity
run: |
echo "--- openvpn3 sessions-list ---"
openvpn3 sessions-list
echo "--- openvpn3 session-stats ---"
openvpn3 session-stats --config .github/vpn/config.ovpn
echo "--- ip addr (tun interface) ---"
ip addr show tun0 || echo "no tun0 interface found"
echo "--- ip route ---"
ip route
echo "--- DNS resolution check for target host (host/IP not printed) ---"
TARGET_HOST="$(echo '${{ secrets.SASJS_SERVER_URL }}' | sed -E 's#^[a-z]+://##; s#[:/].*##')"
if getent hosts "$TARGET_HOST" > /dev/null; then
echo "DNS resolution: OK"
else
echo "DNS resolution: FAILED"
fi
shell: bash
- name: Fetch SASJS server - name: Fetch SASJS server
run: | run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
curl -sS --retry 5 --retry-delay 5 --retry-all-errors --connect-timeout 15 --max-time 30 \
-o /dev/null -w "HTTP status: %{http_code}\n" \
"${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info"
- name: Deploy sasjs-tests - name: Deploy sasjs-tests
run: | run: |
sudo apt install jq sudo apt install jq
cd sasjs-tests cd sasjs-tests
npm i --ignore-scripts jq '.dependencies."@sasjs/adapter" |= "latest"' ./package.json > ./package.temp && mv ./package.temp ./package.json
npm i ../build/sasjs-adapter-5.0.0.tgz npm i
jq '.sasJsConfig.serverUrl |= "${{ secrets.SASJS_SERVER_URL }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json 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.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
jq '.userName |= "${{ secrets.SASJS_USERNAME }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json jq '.userName |= "${{ secrets.SASJS_USERNAME }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
@@ -133,10 +110,8 @@ jobs:
shell: bash shell: bash
- name: Run cypress on sasjs - name: Run cypress on sasjs
env:
TERM: dumb
run: | run: |
sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:3000'|g" ./cypress.config.js sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:5173'|g" ./cypress.config.js
sed -i "s|username: '.*'|username: '${{ secrets.SASJS_USERNAME }}'|g" ./cypress.config.js sed -i "s|username: '.*'|username: '${{ secrets.SASJS_USERNAME }}'|g" ./cypress.config.js
sed -i "s|password: '.*'|password: '${{ secrets.SASJS_PASSWORD }}'|g" ./cypress.config.js sed -i "s|password: '.*'|password: '${{ secrets.SASJS_PASSWORD }}'|g" ./cypress.config.js
cat ./cypress.config.js cat ./cypress.config.js
-2
View File
@@ -1,3 +1 @@
ignore-scripts=true ignore-scripts=true
save-exact=true
fund=false
-1
View File
@@ -288,7 +288,6 @@ 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. - `verbose` - optional, if `true` then a summary of every HTTP response is logged.
- `loginMechanism` - either `Default` or `Redirected`. See [SAS Logon](#sas-logon) section. - `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. - `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`. - `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. - `requestHistoryLimit` - Request history limit. Increasing this limit may affect browser performance, especially with debug (logs) enabled. Default is 10.
+2 -2
View File
@@ -9,10 +9,10 @@ module.exports = defineConfig({
supportFile: 'cypress/support/index.js' supportFile: 'cypress/support/index.js'
}, },
env: { env: {
sasjsTestsUrl: 'http://localhost:3000', sasjsTestsUrl: 'http://localhost:5173',
username: '', username: '',
password: '', password: '',
screenshotOnRunFailure: false, screenshotOnRunFailure: false,
testingFinishTimeout: 300000 testingFinishTimeout: 600000
} }
}) })
+15 -59
View File
@@ -9,64 +9,10 @@ context('sasjs-tests', function () {
}) })
beforeEach(() => { beforeEach(() => {
cy.visit(sasjsTestsUrl) cy.reload()
}) })
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() { function loginIfNeeded() {
cy.get('login-form, tests-view', { timeout: 30000 }).should('exist')
cy.get('body').then(($body) => { cy.get('body').then(($body) => {
if ($body.find('login-form').length > 0) { if ($body.find('login-form').length > 0) {
cy.get('login-form') cy.get('login-form')
@@ -94,9 +40,14 @@ context('sasjs-tests', function () {
cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click() cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click()
waitForTestsToFinish(testingFinishTimeout) cy.get('tests-view')
.shadow()
.find('#run-btn:disabled', {
timeout: testingFinishTimeout
})
.should('not.exist')
assertNoFailedTests() cy.get('test-card').shadow().find('.status-icon.failed').should('not.exist')
}) })
it('Should have all tests successful with debug on', () => { it('Should have all tests successful with debug on', () => {
@@ -110,8 +61,13 @@ context('sasjs-tests', function () {
cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click() cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click()
waitForTestsToFinish(testingFinishTimeout) cy.get('tests-view')
.shadow()
.find('#run-btn:disabled', {
timeout: testingFinishTimeout
})
.should('not.exist')
assertNoFailedTests() cy.get('test-card').shadow().find('.status-icon.failed').should('not.exist')
}) })
}) })
+4298 -6449
View File
File diff suppressed because it is too large Load Diff
+18 -35
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", "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", "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", "publish:lib": "npm run build && cd build && npm publish",
"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: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": "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": "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 --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}\"", "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}\"",
"test": "jest --silent --coverage", "test": "jest --silent --coverage",
"publishInit": "cp -r ./build/* . && rm -rf ./build", "publishInit": "cp -r ./build/* . && rm -rf ./build",
"semantic-release": "semantic-release", "semantic-release": "semantic-release",
@@ -23,24 +23,10 @@
}, },
"release": { "release": {
"plugins": [ "plugins": [
"@semantic-release/commit-analyzer", "@semantic-release/npm",
"@semantic-release/release-notes-generator", {
[ "pkgRoot": "/build"
"@semantic-release/exec", }
{
"prepareCmd": "npm version ${nextRelease.version} --no-git-tag-version"
}
],
[
"@semantic-release/git",
{
"assets": [
"package.json",
"package-lock.json"
]
}
],
"@semantic-release/github"
] ]
}, },
"keywords": [ "keywords": [
@@ -48,16 +34,14 @@
"viya", "viya",
"sasjs" "sasjs"
], ],
"author": "support@4gl.io", "author": "Allan Bowe <support@macropeople.com>",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/sasjs/adapter.git" "url": "https://github.com/sasjs/adapter"
}, },
"license": "ISC", "license": "ISC",
"devDependencies": { "devDependencies": {
"@cypress/webpack-preprocessor": "5.9.1", "@cypress/webpack-preprocessor": "5.9.1",
"@semantic-release/exec": "6.0.3",
"@semantic-release/git": "10.0.1",
"@types/cors": "^2.8.17", "@types/cors": "^2.8.17",
"@types/express": "4.17.13", "@types/express": "4.17.13",
"@types/jest": "29.5.14", "@types/jest": "29.5.14",
@@ -69,17 +53,17 @@
"cp": "0.2.0", "cp": "0.2.0",
"cypress": "^15.7.1", "cypress": "^15.7.1",
"dotenv": "16.0.0", "dotenv": "16.0.0",
"express": "4.22.2", "express": "4.17.3",
"jest": "29.7.0", "jest": "29.7.0",
"jest-environment-jsdom": "^29.7.0", "jest-environment-jsdom": "^29.7.0",
"jest-extended": "4.0.2", "jest-extended": "4.0.2",
"node-polyfill-webpack-plugin": "4.1.0", "node-polyfill-webpack-plugin": "1.1.4",
"path": "0.12.7", "path": "0.12.7",
"pem": "1.14.5", "pem": "1.14.5",
"prettier": "3.8.2", "prettier": "2.8.7",
"process": "0.11.10", "process": "0.11.10",
"semantic-release": "25.0.8", "semantic-release": "19.0.3",
"terser-webpack-plugin": "5.6.1", "terser-webpack-plugin": "5.3.6",
"ts-jest": "29.2.6", "ts-jest": "29.2.6",
"ts-loader": "9.4.0", "ts-loader": "9.4.0",
"tslint": "6.1.3", "tslint": "6.1.3",
@@ -87,17 +71,16 @@
"typedoc": "0.23.24", "typedoc": "0.23.24",
"typedoc-plugin-rename-defaults": "0.6.4", "typedoc-plugin-rename-defaults": "0.6.4",
"typescript": "4.9.5", "typescript": "4.9.5",
"webpack": "5.108.4", "webpack": "5.76.2",
"webpack-cli": "4.9.2" "webpack-cli": "4.9.2"
}, },
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {
"@sasjs/utils": "^3.5.6", "@sasjs/utils": "3.5.6",
"axios": "1.18.1", "axios": "^1.13.5",
"axios-cookiejar-support": "5.0.5", "axios-cookiejar-support": "5.0.5",
"form-data": "4.0.6", "form-data": "4.0.4",
"https": "1.0.0", "https": "1.0.0",
"tough-cookie": "4.1.3" "tough-cookie": "4.1.3"
}, }
"version": "4.17.2"
} }
+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. 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.
> **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. You can use the provided `update:adapter` NPM script for this.
```bash ```bash
npm run update:adapter npm run update:adapter
``` ```
This script builds a new version of the adapter and installs it in the `sasjs-tests` project. This scripts builds a new version of the adapter and installs it in the `sasjs-tests` project.
## Running tests ## Running tests
+1634 -55
View File
File diff suppressed because it is too large Load Diff
+3
View File
@@ -18,5 +18,8 @@
}, },
"overrides": { "overrides": {
"vite": "npm:rolldown-vite@7.2.2" "vite": "npm:rolldown-vite@7.2.2"
},
"dependencies": {
"@sasjs/adapter": "^4.14.0"
} }
} }
+2 -2
View File
@@ -4,8 +4,8 @@
"sasJsConfig": { "sasJsConfig": {
"loginMechanism": "Redirected", "loginMechanism": "Redirected",
"serverUrl": "", "serverUrl": "",
"appLoc": "/Public/app/adapter-tests", "appLoc": "/Public/app/adapter-tests/services",
"serverType": "SASJS", "serverType": "SASVIYA",
"debug": false, "debug": false,
"contextName": "SAS Job Execution compute context", "contextName": "SAS Job Execution compute context",
"useComputeApi": true "useComputeApi": true
+1 -1
View File
@@ -7,7 +7,7 @@
"targets": [ "targets": [
{ {
"name": "4gl", "name": "4gl",
"serverUrl": "https://sas.4gl.io", "serverUrl": "https://sas9.4gl.io",
"serverType": "SASJS", "serverType": "SASJS",
"httpsAgentOptions": { "httpsAgentOptions": {
"allowInsecureRequests": false "allowInsecureRequests": false
+1 -32
View File
@@ -72,7 +72,7 @@ export class TestCard extends HTMLElement {
? ` ? `
<div class="error"> <div class="error">
<strong>Error:</strong> <strong>Error:</strong>
<pre>${formatError(error)}</pre> <pre>${(error as Error).message || String(error)}</pre>
</div> </div>
` `
: '' : ''
@@ -110,35 +110,4 @@ 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) customElements.define('test-card', TestCard)
+2 -4
View File
@@ -66,11 +66,10 @@ export class TestSuiteElement extends HTMLElement {
const passed = completedTests.filter((t) => t.status === 'passed').length const passed = completedTests.filter((t) => t.status === 'passed').length
const failed = completedTests.filter((t) => t.status === 'failed').length const failed = completedTests.filter((t) => t.status === 'failed').length
const running = completedTests.filter((t) => t.status === 'running').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') const statsEl = this.shadow.querySelector('.stats')
if (statsEl) { if (statsEl) {
statsEl.textContent = `Passed: ${passed} | Failed: ${failed} | Running: ${running} | Pending: ${pending}` statsEl.textContent = `Passed: ${passed} | Failed: ${failed} | Running: ${running}`
} }
} }
@@ -81,12 +80,11 @@ export class TestSuiteElement extends HTMLElement {
const passed = completedTests.filter((t) => t.status === 'passed').length const passed = completedTests.filter((t) => t.status === 'passed').length
const failed = completedTests.filter((t) => t.status === 'failed').length const failed = completedTests.filter((t) => t.status === 'failed').length
const running = completedTests.filter((t) => t.status === 'running').length const running = completedTests.filter((t) => t.status === 'running').length
const pending = completedTests.filter((t) => t.status === 'pending').length
this.shadow.innerHTML = ` this.shadow.innerHTML = `
<div class="header"> <div class="header">
<h2>${name}</h2> <h2>${name}</h2>
<div class="stats">Passed: ${passed} | Failed: ${failed} | Running: ${running} | Pending: ${pending}</div> <div class="stats">Passed: ${passed} | Failed: ${failed} | Running: ${running}</div>
</div> </div>
<div class="tests" id="tests-container"></div> <div class="tests" id="tests-container"></div>
` `
+9 -26
View File
@@ -30,14 +30,12 @@ export class TestRunner {
) => void ) => void
): Promise<CompletedTestSuite[]> { ): Promise<CompletedTestSuite[]> {
this.isRunning = true this.isRunning = true
this.completedTestSuites = this.testSuites.map((suite) => ({ this.completedTestSuites = []
name: suite.name,
completedTests: []
}))
await Promise.allSettled( for (let i = 0; i < this.testSuites.length; i++) {
this.testSuites.map((suite, i) => this.runTestSuite(suite, i, onUpdate)) const suite = this.testSuites[i]
) await this.runTestSuite(suite, i, onUpdate)
}
this.isRunning = false this.isRunning = false
return this.completedTestSuites return this.completedTestSuites
@@ -51,23 +49,7 @@ export class TestRunner {
currentIndex: number currentIndex: number
) => void ) => void
): Promise<CompletedTestSuite> { ): Promise<CompletedTestSuite> {
// Seed all tests as pending so every card renders before any run starts. const completedTests: CompletedTest[] = []
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 let context: unknown
// Run beforeAll if exists // Run beforeAll if exists
@@ -80,14 +62,15 @@ export class TestRunner {
const test = suite.tests[i] const test = suite.tests[i]
const currentIndex = suiteIndex * 1000 + i const currentIndex = suiteIndex * 1000 + i
// Flip pending → running // Set status to running
completedTests[i] = { const runningTest: CompletedTest = {
test, test,
result: false, result: false,
error: null, error: null,
executionTime: 0, executionTime: 0,
status: 'running' status: 'running'
} }
completedTests.push(runningTest)
// Notify update // Notify update
if (onUpdate) { if (onUpdate) {
+2 -5
View File
@@ -22,8 +22,6 @@ import { sendArrTests, sendObjTests } from './testSuites/RequestData'
import { fileUploadTests } from './testSuites/FileUpload' import { fileUploadTests } from './testSuites/FileUpload'
import { computeTests } from './testSuites/Compute' import { computeTests } from './testSuites/Compute'
import { sasjsRequestTests } from './testSuites/SasjsRequests' import { sasjsRequestTests } from './testSuites/SasjsRequests'
import { specialCaseTests } from './testSuites/SpecialCases'
import { executionTasksTests } from './testSuites/executionTasks'
async function init() { async function init() {
const appContainer = document.getElementById('app') const appContainer = document.getElementById('app')
@@ -100,14 +98,13 @@ function showTests(
// basicTests(adapter, configTyped.userName || '', configTyped.password || ''), // basicTests(adapter, configTyped.userName || '', configTyped.password || ''),
sendArrTests(adapter, appLoc), sendArrTests(adapter, appLoc),
sendObjTests(adapter), sendObjTests(adapter),
specialCaseTests(adapter), // specialCaseTests(adapter),
sasjsRequestTests(adapter), sasjsRequestTests(adapter),
fileUploadTests(adapter) fileUploadTests(adapter)
] ]
// Add tests for SASVIYA only // Add compute tests for SASVIYA only
if (adapter.getSasjsConfig().serverType === 'SASVIYA') { if (adapter.getSasjsConfig().serverType === 'SASVIYA') {
testSuites.push(executionTasksTests(adapter))
testSuites.push(computeTests(adapter, appLoc)) testSuites.push(computeTests(adapter, appLoc))
} }
+3 -11
View File
@@ -77,7 +77,7 @@ export const basicTests = (
await adapter.logOut() await adapter.logOut()
return await adapter.request( return await adapter.request(
'services/common/sendArr', 'common/sendArr',
stringData, stringData,
undefined, undefined,
async () => { async () => {
@@ -97,11 +97,7 @@ export const basicTests = (
useComputeApi: false useComputeApi: false
} }
return await adapter.request( return await adapter.request('common/sendArr', stringData, config)
'services/common/sendArr',
stringData,
config
)
}, },
assertion: (response: any) => { assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1 return response.table1[0][0] === stringData.table1[0].col1
@@ -116,11 +112,7 @@ export const basicTests = (
debug: true debug: true
} }
return await adapter.request( return await adapter.request('common/sendArr', stringData, config)
'services/common/sendArr',
stringData,
config
)
}, },
assertion: (response: any) => { assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1 return response.table1[0][0] === stringData.table1[0].col1
+4 -11
View File
@@ -11,7 +11,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Compute API request', title: 'Compute API request',
description: 'Should run the request with compute API approach', description: 'Should run the request with compute API approach',
test: async () => { test: async () => {
return await adapter.request('services/common/sendArr', stringData) return await adapter.request('common/sendArr', stringData)
}, },
assertion: (response: any) => { assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1 return response.table1[0][0] === stringData.table1[0].col1
@@ -25,11 +25,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
useComputeApi: false useComputeApi: false
} }
return await adapter.request( return await adapter.request('common/sendArr', stringData, config)
'services/common/sendArr',
stringData,
config
)
}, },
assertion: (response: any) => { assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1 return response.table1[0][0] === stringData.table1[0].col1
@@ -40,10 +36,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
description: 'Should start a compute job and return the session', description: 'Should start a compute job and return the session',
test: () => { test: () => {
const data: any = { table1: [{ col1: 'first col value' }] } const data: any = { table1: [{ col1: 'first col value' }] }
return adapter.startComputeJob( return adapter.startComputeJob(`${appLoc}/common/sendArr`, data)
`${appLoc}/services/common/sendArr`,
data
)
}, },
assertion: (res: any) => { assertion: (res: any) => {
const expectedProperties = ['id', 'applicationName', 'attributes'] const expectedProperties = ['id', 'applicationName', 'attributes']
@@ -56,7 +49,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
test: () => { test: () => {
const data: any = { table1: [{ col1: 'first col value' }] } const data: any = { table1: [{ col1: 'first col value' }] }
return adapter.startComputeJob( return adapter.startComputeJob(
`${appLoc}/services/common/sendArr`, `${appLoc}/common/sendArr`,
data, data,
{}, {},
undefined, undefined,
+1 -5
View File
@@ -22,11 +22,7 @@ export const fileUploadTests = (adapter: SASjs): TestSuite => ({
} }
] ]
return adapter.uploadFile( return adapter.uploadFile('common/sendMacVars', filesToUpload, null)
'services/common/sendMacVars',
filesToUpload,
null
)
}, },
assertion: (response: any) => assertion: (response: any) =>
(response.macvars as any[]).findIndex( (response.macvars as any[]).findIndex(
+21 -29
View File
@@ -53,7 +53,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Absolute paths', title: 'Absolute paths',
description: 'Should work with absolute paths to SAS jobs', description: 'Should work with absolute paths to SAS jobs',
test: () => { test: () => {
return adapter.request(`${appLoc}/services/common/sendArr`, stringData) return adapter.request(`${appLoc}/common/sendArr`, stringData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return res.table1[0][0] === stringData.table1[0].col1 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', title: 'Single string value',
description: 'Should send an array with a single string value', description: 'Should send an array with a single string value',
test: () => { test: () => {
return adapter.request('services/common/sendArr', stringData) return adapter.request('common/sendArr', stringData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return res.table1[0][0] === stringData.table1[0].col1 return res.table1[0][0] === stringData.table1[0].col1
@@ -74,7 +74,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
description: description:
'Should send an array with a long string value under 32765 characters', 'Should send an array with a long string value under 32765 characters',
test: () => { test: () => {
return adapter.request('services/common/sendArr', getLongStringData()) return adapter.request('common/sendArr', getLongStringData())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const longStringData = getLongStringData() const longStringData = getLongStringData()
@@ -87,9 +87,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
'Should error out with long string values over 32765 characters', 'Should error out with long string values over 32765 characters',
test: () => { test: () => {
const data = getLongStringData(32767) const data = getLongStringData(32767)
return adapter return adapter.request('common/sendArr', data).catch((e: any) => e)
.request('services/common/sendArr', data)
.catch((e: any) => e)
}, },
assertion: (error: any) => { assertion: (error: any) => {
return !!error && !!error.error && !!error.error.message return !!error && !!error.error && !!error.error.message
@@ -99,7 +97,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Single numeric value', title: 'Single numeric value',
description: 'Should send an array with a single numeric value', description: 'Should send an array with a single numeric value',
test: () => { test: () => {
return adapter.request('services/common/sendArr', numericData) return adapter.request('common/sendArr', numericData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return res.table1[0][0] === numericData.table1[0].col1 return res.table1[0][0] === numericData.table1[0].col1
@@ -109,7 +107,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Multiple columns', title: 'Multiple columns',
description: 'Should handle data with multiple columns', description: 'Should handle data with multiple columns',
test: () => { test: () => {
return adapter.request('services/common/sendArr', multiColumnData) return adapter.request('common/sendArr', multiColumnData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return ( return (
@@ -124,7 +122,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Multiple rows with nulls', title: 'Multiple rows with nulls',
description: 'Should handle data with multiple rows with null values', description: 'Should handle data with multiple rows with null values',
test: () => { test: () => {
return adapter.request('services/common/sendArr', multipleRowsWithNulls) return adapter.request('common/sendArr', multipleRowsWithNulls)
}, },
assertion: (res: any) => { assertion: (res: any) => {
let result = true let result = true
@@ -150,10 +148,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
title: 'Multiple columns with nulls', title: 'Multiple columns with nulls',
description: 'Should handle data with multiple columns with null values', description: 'Should handle data with multiple columns with null values',
test: () => { test: () => {
return adapter.request( return adapter.request('common/sendArr', multipleColumnsWithNulls)
'services/common/sendArr',
multipleColumnsWithNulls
)
}, },
assertion: (res: any) => { assertion: (res: any) => {
let result = true let result = true
@@ -189,7 +184,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'1InvalidTable': [{ col1: 42 }] '1InvalidTable': [{ col1: 42 }]
} }
return adapter return adapter
.request('services/common/sendObj', invalidData) .request('common/sendObj', invalidData)
.catch((e: any) => e) .catch((e: any) => e)
}, },
assertion: (error: any) => assertion: (error: any) =>
@@ -203,7 +198,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'an invalidTable': [{ col1: 42 }] 'an invalidTable': [{ col1: 42 }]
} }
return adapter return adapter
.request('services/common/sendObj', invalidData) .request('common/sendObj', invalidData)
.catch((e: any) => e) .catch((e: any) => e)
}, },
assertion: (error: any) => assertion: (error: any) =>
@@ -217,7 +212,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'anInvalidTable#': [{ col1: 42 }] 'anInvalidTable#': [{ col1: 42 }]
} }
return adapter return adapter
.request('services/common/sendObj', invalidData) .request('common/sendObj', invalidData)
.catch((e: any) => e) .catch((e: any) => e)
}, },
assertion: (error: any) => assertion: (error: any) =>
@@ -232,7 +227,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
} }
return adapter return adapter
.request('services/common/sendObj', invalidData) .request('common/sendObj', invalidData)
.catch((e: any) => e) .catch((e: any) => e)
}, },
assertion: (error: any) => assertion: (error: any) =>
@@ -246,7 +241,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
inData: [[{ data: 'value' }]] inData: [[{ data: 'value' }]]
} }
return adapter return adapter
.request('services/common/sendObj', invalidData) .request('common/sendObj', invalidData)
.catch((e: any) => e) .catch((e: any) => e)
}, },
assertion: (error: any) => assertion: (error: any) =>
@@ -256,7 +251,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Single string value', title: 'Single string value',
description: 'Should send an object with a single string value', description: 'Should send an object with a single string value',
test: () => { test: () => {
return adapter.request('services/common/sendObj', stringData) return adapter.request('common/sendObj', stringData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return res.table1[0].COL1 === stringData.table1[0].col1 return res.table1[0].COL1 === stringData.table1[0].col1
@@ -267,7 +262,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
description: description:
'Should send an object with a long string value under 32765 characters', 'Should send an object with a long string value under 32765 characters',
test: () => { test: () => {
return adapter.request('services/common/sendObj', getLongStringData()) return adapter.request('common/sendObj', getLongStringData())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const longStringData = getLongStringData() const longStringData = getLongStringData()
@@ -280,7 +275,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
'Should error out with long string values over 32765 characters', 'Should error out with long string values over 32765 characters',
test: () => { test: () => {
return adapter return adapter
.request('services/common/sendObj', getLongStringData(32767)) .request('common/sendObj', getLongStringData(32767))
.catch((e: any) => e) .catch((e: any) => e)
}, },
assertion: (error: any) => { assertion: (error: any) => {
@@ -291,7 +286,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Single numeric value', title: 'Single numeric value',
description: 'Should send an object with a single numeric value', description: 'Should send an object with a single numeric value',
test: () => { test: () => {
return adapter.request('services/common/sendObj', numericData) return adapter.request('common/sendObj', numericData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return res.table1[0].COL1 === numericData.table1[0].col1 return res.table1[0].COL1 === numericData.table1[0].col1
@@ -302,7 +297,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Large data volume', title: 'Large data volume',
description: 'Should send an object with a large amount of data', description: 'Should send an object with a large amount of data',
test: () => { test: () => {
return adapter.request('services/common/sendObj', getLargeObjectData()) return adapter.request('common/sendObj', getLargeObjectData())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const data = getLargeObjectData() const data = getLargeObjectData()
@@ -313,7 +308,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple columns', title: 'Multiple columns',
description: 'Should handle data with multiple columns', description: 'Should handle data with multiple columns',
test: () => { test: () => {
return adapter.request('services/common/sendObj', multiColumnData) return adapter.request('common/sendObj', multiColumnData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return ( return (
@@ -328,7 +323,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple rows with nulls', title: 'Multiple rows with nulls',
description: 'Should handle data with multiple rows with null values', description: 'Should handle data with multiple rows with null values',
test: () => { test: () => {
return adapter.request('services/common/sendObj', multipleRowsWithNulls) return adapter.request('common/sendObj', multipleRowsWithNulls)
}, },
assertion: (res: any) => { assertion: (res: any) => {
let result = true let result = true
@@ -354,10 +349,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple columns with nulls', title: 'Multiple columns with nulls',
description: 'Should handle data with multiple columns with null values', description: 'Should handle data with multiple columns with null values',
test: () => { test: () => {
return adapter.request( return adapter.request('common/sendObj', multipleColumnsWithNulls)
'services/common/sendObj',
multipleColumnsWithNulls
)
}, },
assertion: (res: any) => { assertion: (res: any) => {
let result = true let result = true
+2 -2
View File
@@ -11,7 +11,7 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
title: 'WORK tables', title: 'WORK tables',
description: 'Should get WORK tables after request', description: 'Should get WORK tables after request',
test: async () => { test: async () => {
return adapter.request('services/common/sendArr', data) return adapter.request('common/sendArr', data)
}, },
assertion: () => { assertion: () => {
const requests = adapter.getSasRequests() 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', // 'Should make an error and capture log, in the same time it is testing if debug override is working',
// test: async () => { // test: async () => {
// return adapter // return adapter
// .request('services/common/makeErr', data, { debug: true }) // .request('common/makeErr', data, { debug: true })
// .catch(() => { // .catch(() => {
// const sasRequests = adapter.getSasRequests() // const sasRequests = adapter.getSasRequests()
// const makeErrRequest: any = // const makeErrRequest: any =
+14 -17
View File
@@ -111,7 +111,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Common special characters', title: 'Common special characters',
description: 'Should handle common special characters', description: 'Should handle common special characters',
test: () => { test: () => {
return adapter.request('services/common/sendArr', specialCharData) return adapter.request('common/sendArr', specialCharData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return ( return (
@@ -133,7 +133,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Other special characters', title: 'Other special characters',
description: 'Should handle other special characters', description: 'Should handle other special characters',
test: () => { test: () => {
return adapter.request('services/common/sendArr', moreSpecialCharData) return adapter.request('common/sendArr', moreSpecialCharData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
// If sas session is `latin9` or `wlatin1` we can't process the special characters, // 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', title: 'Wide table with sendArr',
description: 'Should handle data with 10000 columns', description: 'Should handle data with 10000 columns',
test: () => { test: () => {
return adapter.request('services/common/sendArr', getWideData()) return adapter.request('common/sendArr', getWideData())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const data = getWideData() const data = getWideData()
@@ -185,7 +185,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Wide table with sendObj', title: 'Wide table with sendObj',
description: 'Should handle data with 10000 columns', description: 'Should handle data with 10000 columns',
test: () => { test: () => {
return adapter.request('services/common/sendObj', getWideData()) return adapter.request('common/sendObj', getWideData())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const data = getWideData() const data = getWideData()
@@ -202,7 +202,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Multiple tables', title: 'Multiple tables',
description: 'Should handle data with 100 tables', description: 'Should handle data with 100 tables',
test: () => { test: () => {
return adapter.request('services/common/sendArr', getTables()) return adapter.request('common/sendArr', getTables())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const data = getTables() const data = getTables()
@@ -222,7 +222,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Large dataset with sendObj', title: 'Large dataset with sendObj',
description: 'Should handle 5mb of data', description: 'Should handle 5mb of data',
test: () => { test: () => {
return adapter.request('services/common/sendObj', getLargeDataset()) return adapter.request('common/sendObj', getLargeDataset())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const data = getLargeDataset() const data = getLargeDataset()
@@ -237,7 +237,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Large dataset with sendArr', title: 'Large dataset with sendArr',
description: 'Should handle 5mb of data', description: 'Should handle 5mb of data',
test: () => { test: () => {
return adapter.request('services/common/sendArr', getLargeDataset()) return adapter.request('common/sendArr', getLargeDataset())
}, },
assertion: (res: any) => { assertion: (res: any) => {
const data = getLargeDataset() const data = getLargeDataset()
@@ -253,7 +253,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Error and _csrf tables with sendArr', title: 'Error and _csrf tables with sendArr',
description: 'Should handle error and _csrf tables', description: 'Should handle error and _csrf tables',
test: () => { test: () => {
return adapter.request('services/common/sendArr', errorAndCsrfData) return adapter.request('common/sendArr', errorAndCsrfData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return ( return (
@@ -272,7 +272,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Error and _csrf tables with sendObj', title: 'Error and _csrf tables with sendObj',
description: 'Should handle error and _csrf tables', description: 'Should handle error and _csrf tables',
test: () => { test: () => {
return adapter.request('services/common/sendObj', errorAndCsrfData) return adapter.request('common/sendObj', errorAndCsrfData)
}, },
assertion: (res: any) => { assertion: (res: any) => {
return ( return (
@@ -300,7 +300,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
} }
return await adapter.request( return await adapter.request(
'services/common/sendArr', 'common/sendArr',
stringData, stringData,
config, config,
undefined, undefined,
@@ -319,10 +319,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
title: 'Special missing values', title: 'Special missing values',
description: 'Should support special missing values', description: 'Should support special missing values',
test: () => { test: () => {
return adapter.request( return adapter.request('common/sendObj', testTableWithSpecialNumeric)
'services/common/sendObj',
testTableWithSpecialNumeric
)
}, },
assertion: (res: any) => { assertion: (res: any) => {
let assertionRes = true let assertionRes = true
@@ -368,7 +365,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
'Should support special missing values, when one row is send', 'Should support special missing values, when one row is send',
test: () => { test: () => {
return adapter.request( return adapter.request(
'services/common/sendObj', 'common/sendObj',
testTableWithSpecialNumericOneRow testTableWithSpecialNumericOneRow
) )
}, },
@@ -416,7 +413,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
'Should support special missing values, when LOWERCASE value is sent', 'Should support special missing values, when LOWERCASE value is sent',
test: () => { test: () => {
return adapter.request( return adapter.request(
'services/common/sendObj', 'common/sendObj',
testTableWithSpecialNumericLowercase testTableWithSpecialNumericLowercase
) )
}, },
@@ -472,7 +469,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
'Should support special missing values, when one row is send (On VIYA Web Approach)', 'Should support special missing values, when one row is send (On VIYA Web Approach)',
test: () => { test: () => {
return adapter.request( return adapter.request(
'services/common/sendObj', 'common/sendObj',
testTableWithSpecialNumericOneRow, testTableWithSpecialNumericOneRow,
{ useComputeApi: undefined } { useComputeApi: undefined }
) )
@@ -1,126 +0,0 @@
/* 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
}
]
})
-3
View File
@@ -1,8 +1,5 @@
import { defineConfig } from 'vite' import { defineConfig } from 'vite'
export default defineConfig({ export default defineConfig({
server: {
port: 3000
},
build: { build: {
assetsInlineLimit: 0, assetsInlineLimit: 0,
assetsDir: '' assetsDir: ''
+11 -16
View File
@@ -32,18 +32,16 @@ export class ContextManager {
return this.defaultLauncherContexts return this.defaultLauncherContexts
} }
constructor( constructor(private serverUrl: string, private requestClient: RequestClient) {
private serverUrl: string,
private requestClient: RequestClient
) {
if (serverUrl) isUrl(serverUrl) if (serverUrl) isUrl(serverUrl)
} }
public async getComputeContexts(accessToken?: string) { public async getComputeContexts(accessToken?: string) {
const { result: contexts } = await this.requestClient const { result: contexts } = await this.requestClient
.get<{ .get<{ items: Context[] }>(
items: Context[] `${this.serverUrl}/compute/contexts?limit=10000`,
}>(`${this.serverUrl}/compute/contexts?limit=10000`, accessToken) accessToken
)
.catch((err) => { .catch((err) => {
throw prefixMessage(err, 'Error while getting compute contexts. ') throw prefixMessage(err, 'Error while getting compute contexts. ')
}) })
@@ -61,9 +59,10 @@ export class ContextManager {
public async getLauncherContexts(accessToken?: string) { public async getLauncherContexts(accessToken?: string) {
const { result: contexts } = await this.requestClient const { result: contexts } = await this.requestClient
.get<{ .get<{ items: Context[] }>(
items: Context[] `${this.serverUrl}/launcher/contexts?limit=10000`,
}>(`${this.serverUrl}/launcher/contexts?limit=10000`, accessToken) accessToken
)
.catch((err) => { .catch((err) => {
throw prefixMessage(err, 'Error while getting launcher contexts. ') throw prefixMessage(err, 'Error while getting launcher contexts. ')
}) })
@@ -292,9 +291,7 @@ export class ContextManager {
accessToken?: string accessToken?: string
): Promise<Context> { ): Promise<Context> {
const { result: contexts } = await this.requestClient const { result: contexts } = await this.requestClient
.get<{ .get<{ items: Context[] }>(
items: Context[]
}>(
`${this.serverUrl}/compute/contexts?filter=eq(name, "${contextName}")`, `${this.serverUrl}/compute/contexts?filter=eq(name, "${contextName}")`,
accessToken accessToken
) )
@@ -335,9 +332,7 @@ export class ContextManager {
authConfig?: AuthConfig authConfig?: AuthConfig
) { ) {
const { result: contexts } = await this.requestClient const { result: contexts } = await this.requestClient
.get<{ .get<{ items: Context[] }>(
items: Context[]
}>(
`${this.serverUrl}/compute/contexts?limit=10000`, `${this.serverUrl}/compute/contexts?limit=10000`,
authConfig?.access_token authConfig?.access_token
) )
+4 -9
View File
@@ -1026,22 +1026,17 @@ export class SASViyaApiClient {
} }
files.forEach((fileInfo, index) => { files.forEach((fileInfo, index) => {
jobArguments[`_webin_fileuri${index + 1}`] = jobArguments[
`/files/files/${fileInfo.file.id}` `_webin_fileuri${index + 1}`
] = `/files/files/${fileInfo.file.id}`
jobArguments[`_webin_name${index + 1}`] = fileInfo.tableName 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 = { const postJobRequestBody = {
name: `exec-${jobName}`, name: `exec-${jobName}`,
description: 'Powered by SASjs', description: 'Powered by SASjs',
jobDefinition, jobDefinition,
arguments: stringifiedArguments arguments: jobArguments
} }
const { result: postedJob } = await this.requestClient.post<Job>( 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.serverType === ServerType.SasViya
? this.sasjsConfig.pathSASViya ? this.sasjsConfig.pathSASViya
: this.sasjsConfig.serverType === ServerType.Sas9 : this.sasjsConfig.serverType === ServerType.Sas9
? this.sasjsConfig.pathSAS9 ? this.sasjsConfig.pathSAS9
: this.sasjsConfig.pathSASJS : this.sasjsConfig.pathSASJS
this.authManager = new AuthManager( this.authManager = new AuthManager(
this.sasjsConfig.serverUrl, this.sasjsConfig.serverUrl,
+3 -2
View File
@@ -125,8 +125,9 @@ export async function executeOnComputeApi(
jobVariables['_webin_file_count'] = files.length jobVariables['_webin_file_count'] = files.length
files.forEach((fileInfo, index) => { files.forEach((fileInfo, index) => {
jobVariables[`_webin_fileuri${index + 1}`] = jobVariables[
`/files/files/${fileInfo.file.id}` `_webin_fileuri${index + 1}`
] = `/files/files/${fileInfo.file.id}`
jobVariables[`_webin_name${index + 1}`] = fileInfo.tableName jobVariables[`_webin_name${index + 1}`] = fileInfo.tableName
}) })
} else { } else {
+2 -2
View File
@@ -683,8 +683,8 @@ const mockSimplePoll = (runningCount = 2) => {
count === 0 count === 0
? 'pending' ? 'pending'
: count <= runningCount : count <= runningCount
? 'running' ? 'running'
: 'completed', : 'completed',
etag: '', etag: '',
status: 200 status: 200
}) })
-14
View File
@@ -23,20 +23,6 @@ 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 () => { it('should throw an error when the CSV exceeds the maximum length', async () => {
const data = { foo: 'bar' } const data = { foo: 'bar' }
jest jest
+1 -5
View File
@@ -1,6 +1,6 @@
import { prefixMessage } from '@sasjs/utils/error' import { prefixMessage } from '@sasjs/utils/error'
import { RequestClient } from '../../request/RequestClient' import { RequestClient } from '../../request/RequestClient'
import { convertToCSV, isFormatsTable } from '../../utils/convertToCsv' import { convertToCSV } from '../../utils/convertToCsv'
/** /**
* Uploads tables to SAS as specially formatted CSVs. * Uploads tables to SAS as specially formatted CSVs.
@@ -18,10 +18,6 @@ export async function uploadTables(
const uploadedFiles = [] const uploadedFiles = []
for (const tableName in data) { 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) const csv = convertToCSV(data, tableName)
if (csv === 'ERROR: LARGE STRING LENGTH') { if (csv === 'ERROR: LARGE STRING LENGTH') {
throw new Error( throw new Error(
+5 -5
View File
@@ -27,8 +27,8 @@ export class AuthManager {
this.serverType === ServerType.Sas9 this.serverType === ServerType.Sas9
? '/SASLogon/logout?' ? '/SASLogon/logout?'
: this.serverType === ServerType.SasViya : this.serverType === ServerType.SasViya
? '/SASLogon/logout.do?' ? '/SASLogon/logout.do?'
: '/SASLogon/logout' : '/SASLogon/logout'
this.redirectedLoginUrl = this.serverUrl + this.redirectedLoginUrl this.redirectedLoginUrl = this.serverUrl + this.redirectedLoginUrl
} }
@@ -269,8 +269,8 @@ export class AuthManager {
this.serverType === ServerType.SasViya this.serverType === ServerType.SasViya
? `${this.serverUrl}/identities/users/@currentUser` ? `${this.serverUrl}/identities/users/@currentUser`
: this.serverType === ServerType.Sas9 : this.serverType === ServerType.Sas9
? `${this.serverUrl}/SASStoredProcess` ? `${this.serverUrl}/SASStoredProcess`
: `${this.serverUrl}/SASjsApi/session` : `${this.serverUrl}/SASjsApi/session`
const { result: loginResponse } = await this.requestClient const { result: loginResponse } = await this.requestClient
.get<string>(url, undefined, 'text/plain') .get<string>(url, undefined, 'text/plain')
@@ -375,7 +375,7 @@ export class AuthManager {
* *
*/ */
public async logOut() { public async logOut() {
this.requestClient.resetInMemoryAuthState() this.requestClient.clearCsrfTokens()
return this.requestClient.get(this.logoutUrl, undefined).then(() => true) 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', () => { describe('window.open is not blocked', () => {
const mockedOpen = jest const mockedOpen = jest
.fn() .fn()
.mockImplementation(() => ({}) as unknown as Window) .mockImplementation(() => ({} as unknown as Window))
const originalOpen = window.open const originalOpen = window.open
beforeAll(() => { beforeAll(() => {
-7
View File
@@ -11,13 +11,6 @@ export const generateTableUploadForm = (
let tableCounter = 0 let tableCounter = 0
for (const tableName in data) { for (const tableName in data) {
if (
isFormatsTable(tableName) &&
Object.keys(data).includes(tableName.replace(/^\$/, ''))
) {
continue
}
tableCounter++ tableCounter++
// Formats table should not be sent as part of 'sasjs_tables' // Formats table should not be sent as part of 'sasjs_tables'
@@ -1,71 +0,0 @@
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
)
})
})
+1 -4
View File
@@ -8,10 +8,7 @@ import {
import { BaseJobExecutor } from './JobExecutor' import { BaseJobExecutor } from './JobExecutor'
export class ComputeJobExecutor extends BaseJobExecutor { export class ComputeJobExecutor extends BaseJobExecutor {
constructor( constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
serverUrl: string,
private sasViyaApiClient: SASViyaApiClient
) {
super(serverUrl, ServerType.SasViya) super(serverUrl, ServerType.SasViya)
} }
+1 -4
View File
@@ -10,10 +10,7 @@ import { BaseJobExecutor } from './JobExecutor'
import { appendExtraResponseAttributes } from '../utils' import { appendExtraResponseAttributes } from '../utils'
export class JesJobExecutor extends BaseJobExecutor { export class JesJobExecutor extends BaseJobExecutor {
constructor( constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
serverUrl: string,
private sasViyaApiClient: SASViyaApiClient
) {
super(serverUrl, ServerType.SasViya) super(serverUrl, ServerType.SasViya)
} }
+2 -4
View File
@@ -17,10 +17,7 @@ export interface JobExecutor {
} }
export abstract class BaseJobExecutor implements JobExecutor { export abstract class BaseJobExecutor implements JobExecutor {
constructor( constructor(protected serverUrl: string, protected serverType: ServerType) {}
protected serverUrl: string,
protected serverType: ServerType
) {}
private waitingRequests: ExecuteFunction[] = [] private waitingRequests: ExecuteFunction[] = []
@@ -55,6 +52,7 @@ export abstract class BaseJobExecutor implements JobExecutor {
if (config.debug) { if (config.debug) {
requestParams['_omittextlog'] = 'false' requestParams['_omittextlog'] = 'false'
requestParams['_omitSessionResults'] = 'false' requestParams['_omitSessionResults'] = 'false'
requestParams['_debug'] = 131 requestParams['_debug'] = 131
} }
+6 -78
View File
@@ -16,11 +16,9 @@ import { SASViyaApiClient } from '../SASViyaApiClient'
import { import {
isRelativePath, isRelativePath,
parseSasViyaDebugResponse, parseSasViyaDebugResponse,
parseSasViyaLogDebugResponse,
appendExtraResponseAttributes, appendExtraResponseAttributes,
parseWeboutResponse, parseWeboutResponse,
getFormData, getFormData
isNode
} from '../utils' } from '../utils'
import { BaseJobExecutor } from './JobExecutor' import { BaseJobExecutor } from './JobExecutor'
@@ -103,10 +101,6 @@ export class WebJobExecutor extends BaseJobExecutor {
apiUrl += config.contextName?.trim() apiUrl += config.contextName?.trim()
? `&_contextname=${encodeURIComponent(config.contextName)}` ? `&_contextname=${encodeURIComponent(config.contextName)}`
: '' : ''
if (config.runAsTask === true) {
apiUrl += '&_executionTasks=true'
}
} }
let requestParams = { let requestParams = {
@@ -119,26 +113,6 @@ export class WebJobExecutor extends BaseJobExecutor {
*/ */
let formData = getFormData() 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) { if (data) {
const stringifiedData = JSON.stringify(data) const stringifiedData = JSON.stringify(data)
if ( if (
@@ -159,21 +133,10 @@ export class WebJobExecutor extends BaseJobExecutor {
generateTableUploadForm(formData, data) generateTableUploadForm(formData, data)
formData = newFormData formData = newFormData
requestParams = { ...requestParams, ...params } requestParams = { ...requestParams, ...params }
if (
config.serverType === ServerType.SasViya &&
hasExecutionTasksFlag
) {
addDummyFile(formData)
}
} catch (e: any) { } catch (e: any) {
return Promise.reject(new ErrorResponse(e?.message, e)) return Promise.reject(new ErrorResponse(e?.message, e))
} }
} }
} else {
if (config.serverType === ServerType.SasViya && hasExecutionTasksFlag) {
addDummyFile(formData)
}
} }
for (const key in requestParams) { for (const key in requestParams) {
@@ -205,14 +168,11 @@ export class WebJobExecutor extends BaseJobExecutor {
if (config.debug) { if (config.debug) {
switch (this.serverType) { switch (this.serverType) {
case ServerType.SasViya: case ServerType.SasViya:
jsonResponse = jsonResponse = await parseSasViyaDebugResponse(
config.useComputeApi === null && config.runAsTask === true res.result,
? await parseSasViyaLogDebugResponse(res.result) this.requestClient,
: await parseSasViyaDebugResponse( this.serverUrl
res.result, )
this.requestClient,
this.serverUrl
)
break break
case ServerType.Sas9: case ServerType.Sas9:
jsonResponse = jsonResponse =
@@ -271,23 +231,6 @@ export class WebJobExecutor extends BaseJobExecutor {
return requestPromise 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) { private async getJobUri(sasJob: string) {
if (!this.sasViyaApiClient) return '' if (!this.sasViyaApiClient) return ''
let uri = '' let uri = ''
@@ -320,18 +263,3 @@ export class WebJobExecutor extends BaseJobExecutor {
return uri 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'
)
}
}
@@ -1,146 +0,0 @@
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')
})
})
+1 -64
View File
@@ -28,9 +28,6 @@ import {
import { InvalidSASjsCsrfError } from '../types/errors/InvalidSASjsCsrfError' import { InvalidSASjsCsrfError } from '../types/errors/InvalidSASjsCsrfError'
import { inspect } from 'util' import { inspect } from 'util'
const getLogger = () =>
(typeof process !== 'undefined' && process.logger) || console
export class RequestClient implements HttpClient { export class RequestClient implements HttpClient {
private requests: SASjsRequest[] = [] private requests: SASjsRequest[] = []
private requestsLimit: number = 10 private requestsLimit: number = 10
@@ -40,7 +37,6 @@ export class RequestClient implements HttpClient {
protected csrfToken: CsrfToken = { headerName: '', value: '' } protected csrfToken: CsrfToken = { headerName: '', value: '' }
protected fileUploadCsrfToken: CsrfToken | undefined protected fileUploadCsrfToken: CsrfToken | undefined
protected httpClient!: AxiosInstance protected httpClient!: AxiosInstance
private isRecoveringFromNetworkError = false
constructor( constructor(
protected baseUrl: string, protected baseUrl: string,
@@ -81,25 +77,6 @@ export class RequestClient implements HttpClient {
localStorage.setItem('refreshToken', '') localStorage.setItem('refreshToken', '')
} }
public resetInMemoryAuthState() {
this.clearCsrfTokens()
if (typeof localStorage !== 'undefined') {
this.clearLocalStorageTokens()
}
if (typeof document !== 'undefined') {
this.clearAllCookies()
}
}
private clearAllCookies() {
const cookies = document.cookie.split(';')
for (const cookie of cookies) {
const name = cookie.split('=')[0].trim()
if (!name) continue
document.cookie = `${name}=; Max-Age=0; Path=/;`
}
}
public getBaseUrl() { public getBaseUrl() {
return this.httpClient.defaults.baseURL || '' return this.httpClient.defaults.baseURL || ''
} }
@@ -377,7 +354,6 @@ export class RequestClient implements HttpClient {
const csrfTokenKey = Object.keys(params).find((k) => const csrfTokenKey = Object.keys(params).find((k) =>
k?.toLowerCase().includes('csrf') k?.toLowerCase().includes('csrf')
) )
if (csrfTokenKey) { if (csrfTokenKey) {
this.csrfToken.value = params[csrfTokenKey] this.csrfToken.value = params[csrfTokenKey]
this.csrfToken.headerName = this.csrfToken.headerName || 'x-csrf-token' this.csrfToken.headerName = this.csrfToken.headerName || 'x-csrf-token'
@@ -402,7 +378,7 @@ export class RequestClient implements HttpClient {
}) })
.then((res) => res.data) .then((res) => res.data)
.catch((error) => { .catch((error) => {
const logger = getLogger() const logger = process.logger || console
logger.error(error) logger.error(error)
}) })
} }
@@ -711,45 +687,6 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
throw new CertificateError(e.message) 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.resetInMemoryAuthState()
this.isRecoveringFromNetworkError = true
try {
// Re-establish session and CSRF cookie
const rootResponse = await this.httpClient
.get('/', { withXSRFToken: true })
.catch((err) => 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.parseAndSetCsrfToken(rootResponse)
}
return await callback()
} catch {
// Session could not be recovered — surface LoginRequiredError
throw new LoginRequiredError()
} finally {
this.isRecoveringFromNetworkError = false
}
}
if (e.message) throw e if (e.message) throw e
else throw prefixMessage(e, 'Error while handling error. ') 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) { public async login(username: string, password: string, jobsPath: string) {
const codeInjectorPath = `/User Folders/${username}/My Folder/sasjs/runner` const codeInjectorPath = `/User Folders/${username}/My Folder/sasjs/runner`
if (this.httpClient.defaults.jar) { if (this.httpClient.defaults.jar) {
+1 -37
View File
@@ -589,42 +589,6 @@ ${resHeaders[0]}: ${resHeaders[1]}${
requestClient['handleError'](error, () => {}, false) requestClient['handleError'](error, () => {}, false)
).resolves.toEqual(undefined) ).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) getTokenRequestErrorPrefixResponse(err.message, ServerType.SasViya)
) )
expect(rejectionErrorMessage).toContain(expectedError) expect(rejectionErrorMessage).toEqual(expectedError)
}) })
it('should response the POST method using insecure flag', async () => { it('should response the POST method using insecure flag', async () => {
-8
View File
@@ -79,14 +79,6 @@ export class SASjsConfig {
* may affect browser performance, especially with debug (logs) enabled. * may affect browser performance, especially with debug (logs) enabled.
*/ */
requestHistoryLimit?: number = 10 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 { export enum LoginMechanism {
+1 -4
View File
@@ -1,8 +1,5 @@
export class AuthorizeError extends Error { export class AuthorizeError extends Error {
constructor( constructor(public message: string, public confirmUrl: string) {
public message: string,
public confirmUrl: string
) {
super(message) super(message)
this.name = 'AuthorizeError' this.name = 'AuthorizeError'
Object.setPrototypeOf(this, AuthorizeError.prototype) Object.setPrototypeOf(this, AuthorizeError.prototype)
+1 -4
View File
@@ -1,10 +1,7 @@
import { Job } from '../Job' import { Job } from '../Job'
export class ComputeJobExecutionError extends Error { export class ComputeJobExecutionError extends Error {
constructor( constructor(public job: Job, public log: string) {
public job: Job,
public log: string
) {
super('Error: Job execution failed') super('Error: Job execution failed')
this.name = 'ComputeJobExecutionError' this.name = 'ComputeJobExecutionError'
Object.setPrototypeOf(this, ComputeJobExecutionError.prototype) Object.setPrototypeOf(this, ComputeJobExecutionError.prototype)
+1 -4
View File
@@ -1,8 +1,5 @@
export class JobStatePollError extends Error { export class JobStatePollError extends Error {
constructor( constructor(id: string, public originalError: Error) {
id: string,
public originalError: Error
) {
super( super(
`Error while polling job state for job ${id}: ${ `Error while polling job state for job ${id}: ${
originalError.message || originalError originalError.message || originalError
+2 -2
View File
@@ -110,8 +110,8 @@ export const convertToCSV = (
longestValueForField longestValueForField
? longestValueForField ? longestValueForField
: firstFoundType === 'chars' : firstFoundType === 'chars'
? '1' ? '1'
: 'best' : 'best'
}.` }.`
) )
} }
-1
View File
@@ -15,7 +15,6 @@ export * from './parseGeneratedCode'
export * from './parseSasViyaLog' export * from './parseSasViyaLog'
export * from './parseSourceCode' export * from './parseSourceCode'
export * from './parseViyaDebugResponse' export * from './parseViyaDebugResponse'
export * from './parseViyaLogDebugResponse'
export * from './parseWeboutResponse' export * from './parseWeboutResponse'
export * from './serialize' export * from './serialize'
export * from './splitChunks' export * from './splitChunks'
-32
View File
@@ -1,32 +0,0 @@
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)
}
@@ -1,55 +0,0 @@
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.'
)
})
})