1
0
mirror of https://github.com/sasjs/adapter.git synced 2025-12-11 01:14:36 +00:00

Compare commits

...

87 Commits

Author SHA1 Message Date
Yury Shkoda
f13c7e5cf1 Merge pull request #362 from sasjs/request-fix
fix(request): returned response with log
2021-05-13 18:40:50 +03:00
Yury Shkoda
53a7b1c9e6 fix(request): returned response with log 2021-05-13 17:29:48 +03:00
Allan Bowe
8c30cbff13 Merge pull request #359 from sasjs/retry-state-error
fix(job-state-poll): Continue poll regardless of errors
2021-05-11 12:26:16 +03:00
Krishna Acondy
8f3a7f33f8 chore(*): reduce max error count 2021-05-11 10:23:47 +01:00
Krishna Acondy
67ec27bab7 chore(*): increment error count 2021-05-11 10:20:28 +01:00
Krishna Acondy
c1b200b0d8 fix(job-state-poll): error out after max consecutive errors 2021-05-11 10:12:11 +01:00
Krishna Acondy
e03ec996d6 chore(*): fix formatting 2021-05-11 09:25:17 +01:00
Krishna Acondy
ad8dbfd4ec chore(*): add URL to logs 2021-05-11 08:57:35 +01:00
Krishna Acondy
15a774ff81 chore(*): print URL when polling job state 2021-05-11 08:29:15 +01:00
Krishna Acondy
98114c5591 fix(job-state-poll): Continue polling for job state despite errored requests 2021-05-11 08:23:40 +01:00
Muhammad Saad
dffcb66d54 Merge pull request #356 from sasjs/issue657
fix: increasing timeout, closes #657
2021-05-10 16:17:14 +05:00
Allan Bowe
67c7147e62 fix: lint updates 2021-05-10 11:13:39 +00:00
Allan Bowe
50d1b4d824 fix: increasing timeout, closes #657 2021-05-10 11:05:53 +00:00
Krishna Acondy
cf1e3f3835 Merge pull request #350 from sasjs/dependabot/npm_and_yarn/ts-loader-9.1.2
chore(deps-dev): bump ts-loader from 8.1.0 to 9.1.2
2021-05-07 08:54:25 +01:00
Krishna Acondy
2f913e9363 Merge branch 'master' into dependabot/npm_and_yarn/ts-loader-9.1.2 2021-05-07 08:52:16 +01:00
Krishna Acondy
05a9864df8 Merge pull request #353 from sasjs/dependabot/npm_and_yarn/webpack-cli-4.7.0
chore(deps-dev): bump webpack-cli from 4.5.0 to 4.7.0
2021-05-07 08:51:53 +01:00
dependabot-preview[bot]
3a0d764dfa chore(deps-dev): bump webpack-cli from 4.5.0 to 4.7.0
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.5.0 to 4.7.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.5.0...webpack-cli@4.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-07 07:41:45 +00:00
dependabot-preview[bot]
310087b895 chore(deps-dev): bump ts-loader from 8.1.0 to 9.1.2
Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 8.1.0 to 9.1.2.
- [Release notes](https://github.com/TypeStrong/ts-loader/releases)
- [Changelog](https://github.com/TypeStrong/ts-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/TypeStrong/ts-loader/compare/v8.1.0...v9.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-05-07 07:41:36 +00:00
Yury Shkoda
dc39ecd4a8 Merge pull request #352 from sasjs/csv-fix
fix(convert-to-csv): fix bug with escaping quoted string
2021-05-07 10:39:34 +03:00
Yury Shkoda
99e192c5de test(csv-convert): fixed expected output 2021-05-07 10:36:43 +03:00
Yury Shkoda
b86658ef9b fix(csv-convert): fixed data convertion 2021-05-07 10:30:27 +03:00
Saad Jutt
88f08e8864 fix: removed extra slash + added tests 2021-05-07 05:26:08 +05:00
Saad Jutt
80e5de5d65 fix: master tests fixed 2021-05-06 22:28:06 +05:00
Krishna Acondy
665734b168 chore(*): add tests 2021-05-06 13:59:33 +01:00
Krishna Acondy
5543f467e6 chore(*): add more test cases 2021-05-06 13:21:49 +01:00
Krishna Acondy
a32c0879b3 fix(convert-to-csv): fix bug with escaping quoted string 2021-05-06 12:44:08 +01:00
Yury Shkoda
bb2ad5bb9a Merge pull request #344 from sasjs/fix-fetch-session-log
fix: fetch session log for session failed/stopped state
2021-05-04 08:34:18 +03:00
Saad Jutt
6f2f11d112 fix: fetch session log for session failed/stopped state 2021-05-03 18:26:22 +05:00
Krishna Acondy
fef65bbfd2 Merge pull request #326 from sasjs/isUrl-fix 2021-04-22 14:39:01 +01:00
Yury Shkoda
efeba71612 Merge branch 'isUrl-fix' of https://github.com/sasjs/adapter into isUrl-fix 2021-04-22 14:48:02 +03:00
Yury Shkoda
8f54002b1e Merge branch 'master' of https://github.com/sasjs/adapter into isUrl-fix 2021-04-22 14:46:47 +03:00
Yury Shkoda
9d6882799d test(isUrl): covered isUrl utility with unit tests 2021-04-22 14:45:56 +03:00
Yury Shkoda
73a3acee68 Merge branch 'master' into isUrl-fix 2021-04-22 07:55:39 +03:00
Krishna Acondy
0a88220e04 Merge pull request #307 from sasjs/dependabot/npm_and_yarn/types/jest-26.0.22
chore(deps-dev): bump @types/jest from 26.0.20 to 26.0.22
2021-04-21 17:24:54 +01:00
Krishna Acondy
c8e1779272 Merge branch 'master' into dependabot/npm_and_yarn/types/jest-26.0.22 2021-04-21 17:24:46 +01:00
dependabot-preview[bot]
8bd3580e23 chore(deps-dev): bump @types/jest from 26.0.20 to 26.0.22
Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 26.0.20 to 26.0.22.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-21 16:24:07 +00:00
Krishna Acondy
f732b32873 Merge pull request #317 from sasjs/dependabot/npm_and_yarn/sasjs/utils-2.10.2
chore(deps): bump @sasjs/utils from 2.6.3 to 2.10.2
2021-04-21 17:23:18 +01:00
Krishna Acondy
65b18f9148 Merge branch 'master' into dependabot/npm_and_yarn/sasjs/utils-2.10.2 2021-04-21 17:23:10 +01:00
Krishna Acondy
10b1676a35 Merge pull request #323 from sasjs/dependabot/npm_and_yarn/webpack-5.33.2
chore(deps-dev): bump webpack from 5.24.4 to 5.33.2
2021-04-21 17:22:08 +01:00
Krishna Acondy
b9bd09d3e8 Merge branch 'master' into dependabot/npm_and_yarn/webpack-5.33.2 2021-04-21 17:20:48 +01:00
Krishna Acondy
537f687b94 Merge pull request #288 from sasjs/dependabot/npm_and_yarn/semantic-release-17.4.2
chore(deps-dev): bump semantic-release from 17.4.1 to 17.4.2
2021-04-21 17:17:20 +01:00
Krishna Acondy
bfd532f813 Merge branch 'master' into dependabot/npm_and_yarn/semantic-release-17.4.2 2021-04-21 17:17:14 +01:00
Krishna Acondy
4f2b4f46a8 Merge pull request #311 from sasjs/dependabot/npm_and_yarn/ts-loader-8.1.0
chore(deps-dev): bump ts-loader from 8.0.17 to 8.1.0
2021-04-21 17:17:04 +01:00
Krishna Acondy
077cc9458d Merge branch 'master' into dependabot/npm_and_yarn/ts-loader-8.1.0 2021-04-21 17:16:53 +01:00
dependabot-preview[bot]
0a7ab394a4 chore(deps-dev): bump semantic-release from 17.4.1 to 17.4.2
Bumps [semantic-release](https://github.com/semantic-release/semantic-release) from 17.4.1 to 17.4.2.
- [Release notes](https://github.com/semantic-release/semantic-release/releases)
- [Commits](https://github.com/semantic-release/semantic-release/compare/v17.4.1...v17.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-21 16:16:18 +00:00
Krishna Acondy
f873febfde Merge pull request #316 from sasjs/dependabot/npm_and_yarn/typedoc-0.20.35
chore(deps-dev): bump typedoc from 0.20.30 to 0.20.35
2021-04-21 17:14:09 +01:00
dependabot-preview[bot]
55e8ce359b chore(deps-dev): bump typedoc from 0.20.30 to 0.20.35
Bumps [typedoc](https://github.com/TypeStrong/TypeDoc) from 0.20.30 to 0.20.35.
- [Release notes](https://github.com/TypeStrong/TypeDoc/releases)
- [Commits](https://github.com/TypeStrong/TypeDoc/compare/v0.20.30...v0.20.35)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-21 16:12:13 +00:00
Krishna Acondy
99d7c8f119 Merge pull request #254 from sasjs/dependabot/npm_and_yarn/form-data-4.0.0
chore(deps): bump form-data from 3.0.0 to 4.0.0
2021-04-21 17:09:59 +01:00
Krishna Acondy
b3c90f09d6 Merge branch 'master' into dependabot/npm_and_yarn/form-data-4.0.0 2021-04-21 17:08:17 +01:00
dependabot-preview[bot]
2401962c53 chore(deps): bump form-data from 3.0.0 to 4.0.0
Bumps [form-data](https://github.com/form-data/form-data) from 3.0.0 to 4.0.0.
- [Release notes](https://github.com/form-data/form-data/releases)
- [Commits](https://github.com/form-data/form-data/compare/v3.0.0...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-21 15:59:47 +00:00
Krishna Acondy
362b4d4db3 Merge pull request #319 from sasjs/dependabot/npm_and_yarn/y18n-4.0.3
chore(deps): [security] bump y18n from 4.0.0 to 4.0.3
2021-04-21 16:59:24 +01:00
Krishna Acondy
8aea325139 Merge branch 'master' into dependabot/npm_and_yarn/y18n-4.0.3 2021-04-21 16:57:51 +01:00
Krishna Acondy
bb370061a2 Merge pull request #324 from sasjs/dependabot/npm_and_yarn/ssri-6.0.2
chore(deps): [security] bump ssri from 6.0.1 to 6.0.2
2021-04-21 16:57:33 +01:00
Yury Shkoda
48442f7769 fix(utility): improved 'isUrl' utility 2021-04-21 08:11:13 +03:00
dependabot-preview[bot]
e67a8531ce chore(deps): [security] bump ssri from 6.0.1 to 6.0.2
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2. **This update includes a security fix.**
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-16 22:04:40 +00:00
dependabot-preview[bot]
ef4f020e2a chore(deps-dev): bump webpack from 5.24.4 to 5.33.2
Bumps [webpack](https://github.com/webpack/webpack) from 5.24.4 to 5.33.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.24.4...v5.33.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-15 09:07:24 +00:00
dependabot-preview[bot]
2feceeb2f9 chore(deps): [security] bump y18n from 4.0.0 to 4.0.3
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.3. **This update includes a security fix.**
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/y18n-v4.0.3/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/compare/v4.0.0...y18n-v4.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-08 09:21:54 +00:00
dependabot-preview[bot]
eaec922fea chore(deps): bump @sasjs/utils from 2.6.3 to 2.10.2
Bumps [@sasjs/utils](https://github.com/sasjs/utils) from 2.6.3 to 2.10.2.
- [Release notes](https://github.com/sasjs/utils/releases)
- [Commits](https://github.com/sasjs/utils/compare/v2.6.3...v2.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-05 08:40:34 +00:00
dependabot-preview[bot]
de94777fff chore(deps-dev): bump ts-loader from 8.0.17 to 8.1.0
Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 8.0.17 to 8.1.0.
- [Release notes](https://github.com/TypeStrong/ts-loader/releases)
- [Changelog](https://github.com/TypeStrong/ts-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/TypeStrong/ts-loader/compare/v8.0.17...v8.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-30 08:14:56 +00:00
Yury Shkoda
0aa0ae65e0 Merge pull request #313 from sasjs/response-parsing-fix
fix(fetch-log): fixed response parsing
2021-03-30 11:12:40 +03:00
Yury Shkoda
4b0d62d59b Merge branch 'master' into response-parsing-fix 2021-03-30 11:07:37 +03:00
Yury Shkoda
b3ef50e9eb fix(fetch-log): fixed response parsing 2021-03-30 11:04:18 +03:00
Krishna Acondy
d30a1890a1 chore(*): update typedoc docs 2021-03-30 07:57:27 +01:00
Krishna Acondy
f1c2569de3 fix(request): update typings and documentation for request method 2021-03-30 07:57:11 +01:00
Muhammad Saad
4826388cdd Merge pull request #310 from sasjs/issue-309
Issue 309
2021-03-29 18:07:51 +05:00
e88736056a test: fix 2021-03-29 13:43:51 +02:00
9da2a29a72 chore: for VIYA calling API endpoint 2021-03-28 21:55:47 +02:00
dce8a08a86 lint: fix 2021-03-28 19:27:57 +02:00
1fabb9e610 test: fix 2021-03-28 19:04:10 +02:00
23db0ac80d style: lint 2021-03-28 18:40:22 +02:00
28370341d8 fix: login checkSession improved mechanism 2021-03-28 18:40:04 +02:00
Muhammad Saad
a023ffe850 Merge pull request #300 from sasjs/fix-log-by-chunks
fix: after job executing get complete log
2021-03-23 14:33:57 +05:00
Muhammad Saad
a4e77ecf6e Merge branch 'master' into fix-log-by-chunks 2021-03-23 13:04:39 +05:00
Allan Bowe
7efc0a1fb2 Merge pull request #275 from sasjs/allanbowe-patch-1
Update README.md
2021-03-22 22:37:16 +01:00
Allan Bowe
c3e2b2ce70 chore: updates to README 2021-03-22 20:56:18 +00:00
Saad Jutt
dde1228b1d fix: function renamed fetchLogByChunks 2021-03-23 00:50:33 +05:00
Saad Jutt
b3474b6dfb fix: after job executing get complete log 2021-03-22 19:21:01 +05:00
Allan Bowe
179a04ae31 Merge branch 'master' into allanbowe-patch-1 2021-03-16 17:02:47 +01:00
Yury Shkoda
2bdcbda54c Merge pull request #285 from sasjs/error-handling
fix(error-handling): added InternalServerError
2021-03-12 08:57:01 +03:00
Yury Shkoda
a123392c56 Merge branch 'master' into error-handling 2021-03-10 14:50:51 +03:00
Yury Shkoda
719135e366 fix(error-handling): added InternalServerError 2021-03-10 14:43:47 +03:00
Allan Bowe
ba619554b7 Merge branch 'master' into allanbowe-patch-1 2021-03-09 23:47:18 +01:00
Yury Shkoda
6a3ab7032f Merge pull request #284 from sasjs/error-handling
fix(error-handling): fixed console.log
2021-03-09 18:07:53 +03:00
Yury Shkoda
d818d14cb4 Merge branch 'master' into error-handling 2021-03-09 18:07:46 +03:00
Yury Shkoda
599c130395 fix(error-handling): fixed console.log 2021-03-09 18:06:27 +03:00
Muhammad Saad
6f60ac5cc7 Merge branch 'master' into allanbowe-patch-1 2021-03-09 15:33:41 +05:00
Allan Bowe
51a09d049c Update README.md 2021-03-08 11:27:05 +01:00
98 changed files with 5204 additions and 20776 deletions

161
README.md
View File

@@ -6,7 +6,7 @@ SASjs is a open-source framework for building Web Apps on SAS® platforms. You c
1 - `npm install @sasjs/adapter` - for use in a node project
2 - [Download](https://cdn.jsdelivr.net/npm/@sasjs/adapter@1/index.js) and use a copy of the latest JS file
2 - [Download](https://cdn.jsdelivr.net/npm/@sasjs/adapter@2/index.js) and use a copy of the latest JS file
3 - Reference directly from the CDN - in which case click [here](https://www.jsdelivr.com/package/npm/@sasjs/adapter?tab=collection) and select "SRI" to get the script tag with the integrity hash.
@@ -41,8 +41,165 @@ parmcards4;
You now have a simple web app with a backend service!
## Detailed Overview
The SASjs adapter is a JS library and a set of SAS Macros that handle the communication between the frontend app and backend SAS services.
There are three parts to consider:
1. JS request / response
2. SAS inputs / outputs
3. Configuration
### JS Request / Response
To install the library you can simply run `npm i @sasjs/adapter` or include a `<script>` tag with a reference to our [CDN](https://www.jsdelivr.com/package/npm/@sasjs/adapter).
Full technical documentation is available [here](https://adapter.sasjs.io). The main parts are:
### Instantiation
The following code will instantiate an instance of the adapter:
```javascript
let sasJs = new SASjs.default(
{
appLoc: "/Your/SAS/Folder",
serverType:"SAS9"
}
);
```
If you've installed it via NPM, you can import it as a default import like so:
```
import SASjs from '@sasjs/adapter';
```
You can then instantiate it with:
```
const sasJs = new SASjs({your config})
```
More on the config later.
### SAS Logon
The login process can be handled directly, as below, or as a callback function to a SAS request.
```javascript
sasJs.logIn('USERNAME','PASSWORD'
).then((response) => {
if (response.isLoggedIn === true) {
console.log('do stuff')
} else {
console.log('do other stuff')
}
}
```
### Request / Response
A simple request can be sent to SAS in the following fashion:
```javascript
sasJs.request("/path/to/my/service", dataObject)
.then((response) => {
// all tables are in the response object, eg:
console.log(response.tablewith2cols1row[0].COL1.value)
})
```
We supply the path to the SAS service, and a data object. The data object can be null (for services with no input), or can contain one or more tables in the following format:
```javascript
let dataObject={
"tablewith2cols1row": [{
"col1": "val1",
"col2": 42
}],
"tablewith1col2rows": [{
"col": "row1"
}, {
"col": "row2"
}]
};
```
There are optional parameters such as a config object and a callback login function.
The response object will contain returned tables and columns. Table names are always lowercase, and column names uppercase.
The adapter will also cache the logs (if debug enabled) and even the work tables. For performance, it is best to keep debug mode off.
## SAS Inputs / Outputs
The SAS side is handled by a number of macros in the [macro core](https://github.com/sasjs/core) library.
The following snippet shows the process of SAS tables arriving / leaving:
```sas
/* fetch all input tables sent from frontend - they arrive as work tables */
%webout(FETCH)
/* some sas code */
data some sas tables;
set from js;
run;
%webout(OPEN) /* open the JSON to be returned */
%webout(OBJ,some) /* `some` table is sent in object format */
%webout(ARR,sas) /* `sas` table is sent in array format, smaller filesize */
%webout(OBJ,tables,fmt=N) /* unformatted (raw) data */
%webout(OBJ,tables,label=newtable) /* rename tables on export */
%webout(CLOSE) /* close the JSON and send some extra useful variables too */
```
## Configuration
Configuration on the client side involves passing an object on startup, which can also be passed with each request. Technical documentation on the SASjsConfig class is available [here](https://adapter.sasjs.io/classes/types.sasjsconfig.html). The main config items are:
* `appLoc` - this is the folder under which the SAS services will be created.
* `serverType` - either `SAS9` or `SASVIYA`.
* `serverUrl` - the location (including http protocol and port) of the SAS Server. Can be omitted, eg if serving directly from the SAS Web Server, or in streaming mode.
* `debug` - if `true` then SAS Logs and extra debug information is returned.
* `useComputeApi` - if `true` and the serverType is `SASVIYA` then the REST APIs will be called directly (rather than using the JES web service).
* `contextName` - if missing or blank, and `useComputeApi` is `true` and `serverType` is `SASVIYA` then the JES API will be used.
The adapter supports a number of approaches for interfacing with Viya (`serverType` is `SASVIYA`). For maximum performance, be sure to [configure your compute context](https://sasjs.io/guide-viya/#shared-account-and-server-re-use) with `reuseServerProcesses` as `true` and a system account in `runServerAs`. This functionality is available since Viya 3.5. This configuration is supported when [creating contexts using the CLI](https://sasjs.io/sasjs-cli-context/#sasjs-context-create).
### Using JES Web App
In this setup, all requests are routed through the JES web app, at `YOURSERVER/SASJobExecution`. This is the most reliable method, and also the slowest. One request is made to the JES app, and remaining requests (getting job uri, session spawning, passing parameters, running the program, fetching the log) are made on the SAS server by the JES app.
```
{
appLoc:"/Your/Path",
serverType:"SASVIYA"
}
```
### Using the JES API
Here we are running Jobs using the Job Execution Service except this time we are making the requests directly using the REST API instead of through the JES Web App. This is helpful when we need to call web services outside of a browser (eg with the SASjs CLI or other commandline tools). To save one network request, the adapter prefetches the JOB URIs and passes them in the `__job` parameter.
```
{
appLoc:"/Your/Path",
serverType:"SASVIYA",
useComputeApi: true
}
```
### Using the Compute API
This approach is by far the fastest, as a result of the optimisations we have built into the adapter. With this configuration, in the first sasjs request, we take a URI map of the services in the target folder, and create a session manager - which spawns an extra session. The next time a request is made, the adapter will use the 'hot' session. Sessions are deleted after every use, which actually makes this _less_ resource intensive than a typical JES web app, in which all sessions are kept alive by default for 15 minutes.
```
{
appLoc:"/Your/Path",
serverType:"SASVIYA",
useComputeApi: true,
contextName: 'yourComputeContext'
}
```
# More resources
For more information and examples specific to this adapter you can check out the [user guide](https://sasjs.io/sasjs-adapter/) or the [technical](http://adapter.sasjs.io/) documentation.
For more information and examples specific to this adapter you can check out the [user guide](https://sasjs.io/sasjs-adapter/) or the [technical](http://adapter.sasjs.io/) documentation.
For more information on building web apps in general, check out these [resources](https://sasjs.io/training/resources/) or contact the [author](https://www.linkedin.com/in/allanbowe/) directly.
If you are a SAS 9 or SAS Viya customer you can also request a copy of [Data Controller](https://datacontroller.io) - free for up to 5 users, this tool makes use of all parts of the SASjs framework.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

20617
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -5,8 +5,8 @@
"build": "rimraf build && rimraf node && mkdir node && cp -r src/* node && webpack && rimraf build/src && rimraf node",
"package:lib": "npm run build && cp ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
"publish:lib": "npm run build && cd build && npm publish",
"lint:fix": "npx prettier --write 'src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}'",
"lint": "npx prettier --check 'src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}'",
"lint:fix": "npx prettier --write 'src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}' && npx prettier --write 'sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}'",
"lint": "npx prettier --check 'src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}' && npx prettier --check 'sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}'",
"test": "jest --silent --coverage",
"prepublishOnly": "cp -r ./build/* . && rm -rf ./build",
"postpublish": "git clean -fd",
@@ -36,31 +36,31 @@
},
"license": "ISC",
"devDependencies": {
"@types/jest": "^26.0.20",
"@types/jest": "^26.0.22",
"cp": "^0.2.0",
"dotenv": "^8.2.0",
"jest": "^26.6.3",
"jest-extended": "^0.11.5",
"path": "^0.12.7",
"rimraf": "^3.0.2",
"semantic-release": "^17.4.1",
"semantic-release": "^17.4.2",
"terser-webpack-plugin": "^4.2.3",
"ts-jest": "^25.5.1",
"ts-loader": "^8.0.17",
"ts-loader": "^9.1.2",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"typedoc": "^0.20.30",
"typedoc": "^0.20.35",
"typedoc-neo-theme": "^1.1.0",
"typedoc-plugin-external-module-name": "^4.0.6",
"typescript": "^3.9.9",
"webpack": "^5.24.4",
"webpack-cli": "^4.5.0"
"webpack": "^5.33.2",
"webpack-cli": "^4.7.0"
},
"main": "index.js",
"dependencies": {
"@sasjs/utils": "^2.6.3",
"@sasjs/utils": "^2.10.2",
"axios": "^0.21.1",
"form-data": "^3.0.0",
"form-data": "^4.0.0",
"https": "^1.0.0"
}
}

View File

@@ -1,6 +1,6 @@
{
"trailingComma": "none",
"tabWidth": 2,
"semi": true,
"singleQuote": false
"semi": false,
"singleQuote": true
}

View File

@@ -2005,18 +2005,18 @@
},
"@sasjs/adapter": {
"version": "file:../build/sasjs-adapter-5.0.0.tgz",
"integrity": "sha512-1t+3LIL2BFw8HpZUPI9QM24801+JH4DCAu4eHoLLmytYhN72asMi1aVtgSDb1xiJYgpbTG7EK3qRpHIV8cEN8w==",
"integrity": "sha512-DxoQbdJqzqOTIuT7qwSfAbmNTWdpOx5zGkiMuZBSwoi9lSsRNoARiWnJq5Vl6h4RXJlc/FVdBFt35RZm4Mc0ZQ==",
"requires": {
"@sasjs/utils": "^2.5.0",
"@sasjs/utils": "^2.10.2",
"axios": "^0.21.1",
"form-data": "^3.0.0",
"form-data": "^4.0.0",
"https": "^1.0.0"
},
"dependencies": {
"form-data": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.8",
@@ -2046,14 +2046,70 @@
}
},
"@sasjs/utils": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.5.1.tgz",
"integrity": "sha512-a3ISiUX8Yz7au4XYxq2KWf9ODT6nsIDbE4FEqS+AQ3McxZkfuAk4v+REXjOmIlcyQd4R4bufEK8XoB6AROn9sA==",
"version": "2.12.1",
"resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.12.1.tgz",
"integrity": "sha512-6gZS5zW0J70P7XaVuEczyfHVaVa8Ks/aWr4PIlpJcxWD0enJtCEmos2DdnezdSoNvODkPq/8rzMPqko5jaXK1Q==",
"requires": {
"@types/prompts": "^2.0.9",
"@types/prompts": "^2.0.11",
"chalk": "^4.1.1",
"cli-table": "^0.3.6",
"consola": "^2.15.0",
"prompts": "^2.4.0",
"prompts": "^2.4.1",
"valid-url": "^1.0.9"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
"prompts": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
"integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
"requires": {
"kleur": "^3.0.3",
"sisteransi": "^1.0.5"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"@semantic-ui-react/event-stack": {
@@ -2366,9 +2422,9 @@
"integrity": "sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA=="
},
"@types/prompts": {
"version": "2.0.9",
"resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.9.tgz",
"integrity": "sha512-TORZP+FSjTYMWwKadftmqEn6bziN5RnfygehByGsjxoK5ydnClddtv6GikGWPvCm24oI+YBwck5WDxIIyNxUrA==",
"version": "2.0.11",
"resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.11.tgz",
"integrity": "sha512-dcF5L3rU9VfpLEJIV++FEyhGhuIpJllNEwllVuJ5g8eoVqjf048tW9+spivIwjzgPbtaGAl7mIZW3cmhDAq2UQ==",
"requires": {
"@types/node": "*"
}
@@ -4460,6 +4516,14 @@
"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
"integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
},
"cli-table": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz",
"integrity": "sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==",
"requires": {
"colors": "1.0.3"
}
},
"cliui": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -4568,6 +4632,11 @@
"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
"integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw=="
},
"colors": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
"integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs="
},
"combined-stream": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",

View File

@@ -4,7 +4,7 @@
"homepage": ".",
"private": true,
"dependencies": {
"@sasjs/adapter": "^2.2.4",
"@sasjs/adapter": "file:../build/sasjs-adapter-5.0.0.tgz",
"@sasjs/test-framework": "^1.4.0",
"@types/jest": "^26.0.20",
"@types/node": "^14.14.25",
@@ -23,8 +23,8 @@
"test": "react-scripts test",
"eject": "react-scripts eject",
"update:adapter": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz",
"deploy:tests": "npm run build && rsync -avhe ssh ./build/* --delete $SSH_ACCOUNT:$DEPLOY_PATH",
"deploy": "npm run update:adapter && npm run deploy:tests"
"deploy:tests": "rsync -avhe ssh ./build/* --delete $SSH_ACCOUNT:$DEPLOY_PATH",
"deploy": "npm run update:adapter && npm run build && npm run deploy:tests"
},
"eslintConfig": {
"extends": "react-app"

View File

@@ -1,15 +1,15 @@
import React, { ReactElement, useState, useContext, useEffect } from "react";
import { TestSuiteRunner, TestSuite, AppContext } from "@sasjs/test-framework";
import { basicTests } from "./testSuites/Basic";
import { sendArrTests, sendObjTests } from "./testSuites/RequestData";
import { specialCaseTests } from "./testSuites/SpecialCases";
import { sasjsRequestTests } from "./testSuites/SasjsRequests";
import "@sasjs/test-framework/dist/index.css";
import { computeTests } from "./testSuites/Compute";
import React, { ReactElement, useState, useContext, useEffect } from 'react'
import { TestSuiteRunner, TestSuite, AppContext } from '@sasjs/test-framework'
import { basicTests } from './testSuites/Basic'
import { sendArrTests, sendObjTests } from './testSuites/RequestData'
import { specialCaseTests } from './testSuites/SpecialCases'
import { sasjsRequestTests } from './testSuites/SasjsRequests'
import '@sasjs/test-framework/dist/index.css'
import { computeTests } from './testSuites/Compute'
const App = (): ReactElement<{}> => {
const { adapter, config } = useContext(AppContext);
const [testSuites, setTestSuites] = useState<TestSuite[]>([]);
const { adapter, config } = useContext(AppContext)
const [testSuites, setTestSuites] = useState<TestSuite[]>([])
useEffect(() => {
if (adapter) {
@@ -20,15 +20,15 @@ const App = (): ReactElement<{}> => {
specialCaseTests(adapter),
sasjsRequestTests(adapter),
computeTests(adapter)
]);
])
}
}, [adapter, config]);
}, [adapter, config])
return (
<div className="app">
{adapter && testSuites && <TestSuiteRunner testSuites={testSuites} />}
</div>
);
};
)
}
export default App;
export default App

View File

@@ -1,22 +1,22 @@
import React, { ReactElement, useState, useCallback, useContext } from "react";
import "./Login.scss";
import { AppContext } from "@sasjs/test-framework";
import { Redirect } from "react-router-dom";
import React, { ReactElement, useState, useCallback, useContext } from 'react'
import './Login.scss'
import { AppContext } from '@sasjs/test-framework'
import { Redirect } from 'react-router-dom'
const Login = (): ReactElement<{}> => {
const [username, setUsername] = useState("");
const [password, setPassword] = useState("");
const appContext = useContext(AppContext);
const [username, setUsername] = useState('')
const [password, setPassword] = useState('')
const appContext = useContext(AppContext)
const handleSubmit = useCallback(
(e) => {
e.preventDefault();
e.preventDefault()
appContext.adapter.logIn(username, password).then((res) => {
appContext.setIsLoggedIn(res.isLoggedIn);
});
appContext.setIsLoggedIn(res.isLoggedIn)
})
},
[username, password, appContext]
);
)
return !appContext.isLoggedIn ? (
<div className="login-container">
@@ -48,7 +48,7 @@ const Login = (): ReactElement<{}> => {
</div>
) : (
<Redirect to="/" />
);
};
)
}
export default Login;
export default Login

View File

@@ -1,23 +1,23 @@
import React, { ReactElement, useContext, FunctionComponent } from "react";
import { Redirect, Route } from "react-router-dom";
import { AppContext } from "@sasjs/test-framework";
import React, { ReactElement, useContext, FunctionComponent } from 'react'
import { Redirect, Route } from 'react-router-dom'
import { AppContext } from '@sasjs/test-framework'
interface PrivateRouteProps {
component: FunctionComponent;
exact?: boolean;
path: string;
component: FunctionComponent
exact?: boolean
path: string
}
const PrivateRoute = (
props: PrivateRouteProps
): ReactElement<PrivateRouteProps> => {
const { component, path, exact } = props;
const appContext = useContext(AppContext);
const { component, path, exact } = props
const appContext = useContext(AppContext)
return appContext.isLoggedIn ? (
<Route component={component} path={path} exact={exact} />
) : (
<Redirect to="/login" />
);
};
)
}
export default PrivateRoute;
export default PrivateRoute

View File

@@ -1,12 +1,12 @@
import React from "react";
import ReactDOM from "react-dom";
import { Route, HashRouter, Switch } from "react-router-dom";
import "./index.scss";
import * as serviceWorker from "./serviceWorker";
import { AppProvider } from "@sasjs/test-framework";
import PrivateRoute from "./PrivateRoute";
import Login from "./Login";
import App from "./App";
import React from 'react'
import ReactDOM from 'react-dom'
import { Route, HashRouter, Switch } from 'react-router-dom'
import './index.scss'
import * as serviceWorker from './serviceWorker'
import { AppProvider } from '@sasjs/test-framework'
import PrivateRoute from './PrivateRoute'
import Login from './Login'
import App from './App'
ReactDOM.render(
<AppProvider>
@@ -17,10 +17,10 @@ ReactDOM.render(
</Switch>
</HashRouter>
</AppProvider>,
document.getElementById("root")
);
document.getElementById('root')
)
// If you want your app to work offline and load faster, you can change
// unregister() to register() below. Note this comes with some pitfalls.
// Learn more about service workers: https://bit.ly/CRA-PWA
serviceWorker.unregister();
serviceWorker.unregister()

View File

@@ -11,46 +11,46 @@
// opt-in, read https://bit.ly/CRA-PWA
const isLocalhost = Boolean(
window.location.hostname === "localhost" ||
window.location.hostname === 'localhost' ||
// [::1] is the IPv6 localhost address.
window.location.hostname === "[::1]" ||
window.location.hostname === '[::1]' ||
// 127.0.0.0/8 are considered localhost for IPv4.
window.location.hostname.match(
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
)
);
)
export function register(config) {
if (process.env.NODE_ENV === "production" && "serviceWorker" in navigator) {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
// The URL constructor is available in all browsers that support SW.
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href)
if (publicUrl.origin !== window.location.origin) {
// Our service worker won't work if PUBLIC_URL is on a different origin
// from what our page is served on. This might happen if a CDN is used to
// serve assets; see https://github.com/facebook/create-react-app/issues/2374
return;
return
}
window.addEventListener("load", () => {
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
window.addEventListener('load', () => {
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`
if (isLocalhost) {
// This is running on localhost. Let's check if a service worker still exists or not.
checkValidServiceWorker(swUrl, config);
checkValidServiceWorker(swUrl, config)
// Add some additional logging to localhost, pointing developers to the
// service worker/PWA documentation.
navigator.serviceWorker.ready.then(() => {
console.log(
"This web app is being served cache-first by a service " +
"worker. To learn more, visit https://bit.ly/CRA-PWA"
);
});
'This web app is being served cache-first by a service ' +
'worker. To learn more, visit https://bit.ly/CRA-PWA'
)
})
} else {
// Is not localhost. Just register service worker
registerValidSW(swUrl, config);
registerValidSW(swUrl, config)
}
});
})
}
}
@@ -59,83 +59,83 @@ function registerValidSW(swUrl, config) {
.register(swUrl)
.then((registration) => {
registration.onupdatefound = () => {
const installingWorker = registration.installing;
const installingWorker = registration.installing
if (installingWorker == null) {
return;
return
}
installingWorker.onstatechange = () => {
if (installingWorker.state === "installed") {
if (installingWorker.state === 'installed') {
if (navigator.serviceWorker.controller) {
// At this point, the updated precached content has been fetched,
// but the previous service worker will still serve the older
// content until all client tabs are closed.
console.log(
"New content is available and will be used when all " +
"tabs for this page are closed. See https://bit.ly/CRA-PWA."
);
'New content is available and will be used when all ' +
'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
)
// Execute callback
if (config && config.onUpdate) {
config.onUpdate(registration);
config.onUpdate(registration)
}
} else {
// At this point, everything has been precached.
// It's the perfect time to display a
// "Content is cached for offline use." message.
console.log("Content is cached for offline use.");
console.log('Content is cached for offline use.')
// Execute callback
if (config && config.onSuccess) {
config.onSuccess(registration);
config.onSuccess(registration)
}
}
}
};
};
}
}
})
.catch((error) => {
console.error("Error during service worker registration:", error);
});
console.error('Error during service worker registration:', error)
})
}
function checkValidServiceWorker(swUrl, config) {
// Check if the service worker can be found. If it can't reload the page.
fetch(swUrl, {
headers: { "Service-Worker": "script" }
headers: { 'Service-Worker': 'script' }
})
.then((response) => {
// Ensure service worker exists, and that we really are getting a JS file.
const contentType = response.headers.get("content-type");
const contentType = response.headers.get('content-type')
if (
response.status === 404 ||
(contentType != null && contentType.indexOf("javascript") === -1)
(contentType != null && contentType.indexOf('javascript') === -1)
) {
// No service worker found. Probably a different app. Reload the page.
navigator.serviceWorker.ready.then((registration) => {
registration.unregister().then(() => {
window.location.reload();
});
});
window.location.reload()
})
})
} else {
// Service worker found. Proceed as normal.
registerValidSW(swUrl, config);
registerValidSW(swUrl, config)
}
})
.catch(() => {
console.log(
"No internet connection found. App is running in offline mode."
);
});
'No internet connection found. App is running in offline mode.'
)
})
}
export function unregister() {
if ("serviceWorker" in navigator) {
if ('serviceWorker' in navigator) {
navigator.serviceWorker.ready
.then((registration) => {
registration.unregister();
registration.unregister()
})
.catch((error) => {
console.error(error.message);
});
console.error(error.message)
})
}
}

View File

@@ -2,4 +2,4 @@
// allows you to do things like:
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
import "@testing-library/jest-dom/extend-expect";
import '@testing-library/jest-dom/extend-expect'

View File

@@ -1,97 +1,102 @@
import SASjs, { SASjsConfig } from "@sasjs/adapter";
import { TestSuite } from "@sasjs/test-framework";
import { ServerType } from "@sasjs/utils/types";
import SASjs, { SASjsConfig } from '@sasjs/adapter'
import { TestSuite } from '@sasjs/test-framework'
import { ServerType } from '@sasjs/utils/types'
const stringData: any = { table1: [{ col1: "first col value" }] };
const stringData: any = { table1: [{ col1: 'first col value' }] }
const defaultConfig: SASjsConfig = {
serverUrl: window.location.origin,
pathSAS9: "/SASStoredProcess/do",
pathSASViya: "/SASJobExecution",
appLoc: "/Public/seedapp",
pathSAS9: '/SASStoredProcess/do',
pathSASViya: '/SASJobExecution',
appLoc: '/Public/seedapp',
serverType: ServerType.SasViya,
debug: false,
contextName: "SAS Job Execution compute context",
contextName: 'SAS Job Execution compute context',
useComputeApi: false,
allowInsecureRequests: false
};
}
const customConfig = {
serverUrl: "http://url.com",
pathSAS9: "sas9",
pathSASViya: "viya",
appLoc: "/Public/seedapp",
serverUrl: 'http://url.com',
pathSAS9: 'sas9',
pathSASViya: 'viya',
appLoc: '/Public/seedapp',
serverType: ServerType.Sas9,
debug: false
};
}
export const basicTests = (
adapter: SASjs,
userName: string,
password: string
): TestSuite => ({
name: "Basic Tests",
name: 'Basic Tests',
tests: [
{
title: "Log in",
description: "Should log the user in",
title: 'Log in',
description: 'Should log the user in',
test: async () => {
return adapter.logIn(userName, password);
return adapter.logIn(userName, password)
},
assertion: (response: any) =>
response && response.isLoggedIn && response.userName === userName
},
{
title: "Multiple Log in attempts",
title: 'Multiple Log in attempts',
description:
"Should fail on first attempt and should log the user in on second attempt",
'Should fail on first attempt and should log the user in on second attempt',
test: async () => {
await adapter.logOut();
await adapter.logIn("invalid", "invalid");
return adapter.logIn(userName, password);
await adapter.logOut()
await adapter.logIn('invalid', 'invalid')
return adapter.logIn(userName, password)
},
assertion: (response: any) =>
response && response.isLoggedIn && response.userName === userName
},
{
title: "Trigger login callback",
title: 'Trigger login callback',
description:
"Should trigger required login callback and after successful login, it should finish the request",
'Should trigger required login callback and after successful login, it should finish the request',
test: async () => {
await adapter.logOut();
return await adapter.request("common/sendArr", stringData, null, () => {
adapter.logIn(userName, password);
});
await adapter.logOut()
return await adapter.request(
'common/sendArr',
stringData,
undefined,
() => {
adapter.logIn(userName, password)
}
)
},
assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1;
return response.table1[0][0] === stringData.table1[0].col1
}
},
{
title: "Request with debug on",
title: 'Request with debug on',
description:
"Should complete successful request with debugging switched on",
'Should complete successful request with debugging switched on',
test: async () => {
const config = {
debug: true
}
return await adapter.request("common/sendArr", stringData, config)
return await adapter.request('common/sendArr', stringData, config)
},
assertion: (response: any) => {
return response.table1[0][0] === stringData.table1[0].col1;
return response.table1[0][0] === stringData.table1[0].col1
}
},
{
title: "Default config",
title: 'Default config',
description:
"Should instantiate with default config when none is provided",
'Should instantiate with default config when none is provided',
test: async () => {
return Promise.resolve(new SASjs());
return Promise.resolve(new SASjs())
},
assertion: (sasjsInstance: SASjs) => {
const sasjsConfig = sasjsInstance.getSasjsConfig();
const sasjsConfig = sasjsInstance.getSasjsConfig()
return (
sasjsConfig.serverUrl === defaultConfig.serverUrl &&
@@ -100,17 +105,17 @@ export const basicTests = (
sasjsConfig.appLoc === defaultConfig.appLoc &&
sasjsConfig.serverType === defaultConfig.serverType &&
sasjsConfig.debug === defaultConfig.debug
);
)
}
},
{
title: "Custom config",
description: "Should use fully custom config whenever supplied",
title: 'Custom config',
description: 'Should use fully custom config whenever supplied',
test: async () => {
return Promise.resolve(new SASjs(customConfig));
return Promise.resolve(new SASjs(customConfig))
},
assertion: (sasjsInstance: SASjs) => {
const sasjsConfig = sasjsInstance.getSasjsConfig();
const sasjsConfig = sasjsInstance.getSasjsConfig()
return (
sasjsConfig.serverUrl === customConfig.serverUrl &&
sasjsConfig.pathSAS9 === customConfig.pathSAS9 &&
@@ -118,28 +123,28 @@ export const basicTests = (
sasjsConfig.appLoc === customConfig.appLoc &&
sasjsConfig.serverType === customConfig.serverType &&
sasjsConfig.debug === customConfig.debug
);
)
}
},
{
title: "Config overrides",
description: "Should override default config with supplied properties",
title: 'Config overrides',
description: 'Should override default config with supplied properties',
test: async () => {
return Promise.resolve(
new SASjs({ serverUrl: "http://test.com", debug: false })
);
new SASjs({ serverUrl: 'http://test.com', debug: false })
)
},
assertion: (sasjsInstance: SASjs) => {
const sasjsConfig = sasjsInstance.getSasjsConfig();
const sasjsConfig = sasjsInstance.getSasjsConfig()
return (
sasjsConfig.serverUrl === "http://test.com" &&
sasjsConfig.serverUrl === 'http://test.com' &&
sasjsConfig.pathSAS9 === defaultConfig.pathSAS9 &&
sasjsConfig.pathSASViya === defaultConfig.pathSASViya &&
sasjsConfig.appLoc === defaultConfig.appLoc &&
sasjsConfig.serverType === defaultConfig.serverType &&
sasjsConfig.debug === false
);
)
}
}
]
});
})

View File

@@ -1,106 +1,100 @@
import SASjs from "@sasjs/adapter";
import { TestSuite } from "@sasjs/test-framework";
import SASjs from '@sasjs/adapter'
import { TestSuite } from '@sasjs/test-framework'
export const computeTests = (adapter: SASjs): TestSuite => ({
name: "Compute",
name: 'Compute',
tests: [
{
title: "Start Compute Job - not waiting for result",
description: "Should start a compute job and return the session",
title: 'Start Compute Job - not waiting for result',
description: 'Should start a compute job and return the session',
test: () => {
const data: any = { table1: [{ col1: "first col value" }] };
return adapter.startComputeJob("/Public/app/common/sendArr", data);
const data: any = { table1: [{ col1: 'first col value' }] }
return adapter.startComputeJob('/Public/app/common/sendArr', data)
},
assertion: (res: any) => {
const expectedProperties = ["id", "applicationName", "attributes"];
return validate(expectedProperties, res);
const expectedProperties = ['id', 'applicationName', 'attributes']
return validate(expectedProperties, res)
}
},
{
title: "Start Compute Job - waiting for result",
description: "Should start a compute job and return the job",
title: 'Start Compute Job - waiting for result',
description: 'Should start a compute job and return the job',
test: () => {
const data: any = { table1: [{ col1: "first col value" }] };
const data: any = { table1: [{ col1: 'first col value' }] }
return adapter.startComputeJob(
"/Public/app/common/sendArr",
'/Public/app/common/sendArr',
data,
{},
"",
'',
true
);
)
},
assertion: (res: any) => {
const expectedProperties = [
"id",
"state",
"creationTimeStamp",
"jobConditionCode"
];
return validate(expectedProperties, res.job);
'id',
'state',
'creationTimeStamp',
'jobConditionCode'
]
return validate(expectedProperties, res.job)
}
},
{
title: "Execute Script Viya - complete job",
description: "Should execute sas file and return log",
title: 'Execute Script Viya - complete job',
description: 'Should execute sas file and return log',
test: () => {
const fileLines = [
`data;`,
`do x=1 to 100;`,
`output;`,
`end;`,
`run;`
];
const fileLines = [`data;`, `do x=1 to 100;`, `output;`, `end;`, `run;`]
return adapter.executeScriptSASViya(
"sasCode.sas",
'sasCode.sas',
fileLines,
"SAS Studio compute context",
'SAS Studio compute context',
undefined,
true
);
)
},
assertion: (res: any) => {
const expectedLogContent = `1 data;\\n2 do x=1 to 100;\\n3 output;\\n4 end;\\n5 run;\\n\\n`;
const expectedLogContent = `1 data;\\n2 do x=1 to 100;\\n3 output;\\n4 end;\\n5 run;\\n\\n`
return validateLog(expectedLogContent, res.log);
return validateLog(expectedLogContent, res.log)
}
},
{
title: "Execute Script Viya - failed job",
description: "Should execute sas file and return log",
title: 'Execute Script Viya - failed job',
description: 'Should execute sas file and return log',
test: () => {
const fileLines = [`%abort;`];
const fileLines = [`%abort;`]
return adapter
.executeScriptSASViya(
"sasCode.sas",
'sasCode.sas',
fileLines,
"SAS Studio compute context",
'SAS Studio compute context',
undefined,
true
)
.catch((err: any) => err);
.catch((err: any) => err)
},
assertion: (res: any) => {
const expectedLogContent = `1 %abort;\\nERROR: The %ABORT statement is not valid in open code.\\n`;
const expectedLogContent = `1 %abort;\\nERROR: The %ABORT statement is not valid in open code.\\n`
return validateLog(expectedLogContent, res.log);
return validateLog(expectedLogContent, res.log)
}
}
]
});
})
const validateLog = (text: string, log: string): boolean => {
const isValid = JSON.stringify(log).includes(text);
const isValid = JSON.stringify(log).includes(text)
return isValid;
};
return isValid
}
const validate = (expectedProperties: string[], data: any): boolean => {
const actualProperties = Object.keys(data);
const actualProperties = Object.keys(data)
const isValid = expectedProperties.every((property) =>
actualProperties.includes(property)
);
return isValid;
};
)
return isValid
}

View File

@@ -1,111 +1,112 @@
import SASjs from "@sasjs/adapter";
import { TestSuite } from "@sasjs/test-framework";
import SASjs from '@sasjs/adapter'
import { TestSuite } from '@sasjs/test-framework'
const stringData: any = { table1: [{ col1: "first col value" }] };
const numericData: any = { table1: [{ col1: 3.14159265 }] };
const stringData: any = { table1: [{ col1: 'first col value' }] }
const numericData: any = { table1: [{ col1: 3.14159265 }] }
const multiColumnData: any = {
table1: [{ col1: 42, col2: 1.618, col3: "x", col4: "x" }]
};
table1: [{ col1: 42, col2: 1.618, col3: 'x', col4: 'x' }]
}
const multipleRowsWithNulls: any = {
table1: [
{ col1: 42, col2: null, col3: "x", col4: "" },
{ col1: 42, col2: null, col3: "x", col4: "" },
{ col1: 42, col2: null, col3: "x", col4: "" },
{ col1: 42, col2: 1.62, col3: "x", col4: "x" },
{ col1: 42, col2: 1.62, col3: "x", col4: "x" }
{ col1: 42, col2: null, col3: 'x', col4: '' },
{ col1: 42, col2: null, col3: 'x', col4: '' },
{ col1: 42, col2: null, col3: 'x', col4: '' },
{ col1: 42, col2: 1.62, col3: 'x', col4: 'x' },
{ col1: 42, col2: 1.62, col3: 'x', col4: 'x' }
]
};
}
const multipleColumnsWithNulls: any = {
table1: [
{ col1: 42, col2: null, col3: "x", col4: null },
{ col1: 42, col2: null, col3: "x", col4: null },
{ col1: 42, col2: null, col3: "x", col4: null },
{ col1: 42, col2: null, col3: "x", col4: "" },
{ col1: 42, col2: null, col3: "x", col4: "" }
{ col1: 42, col2: null, col3: 'x', col4: null },
{ col1: 42, col2: null, col3: 'x', col4: null },
{ col1: 42, col2: null, col3: 'x', col4: null },
{ col1: 42, col2: null, col3: 'x', col4: '' },
{ col1: 42, col2: null, col3: 'x', col4: '' }
]
};
}
const getLongStringData = (length = 32764) => {
let x = "X";
let x = 'X'
for (let i = 1; i <= length; i++) {
x = x + "X";
x = x + 'X'
}
const data: any = { table1: [{ col1: x }] };
return data;
};
const data: any = { table1: [{ col1: x }] }
return data
}
const getLargeObjectData = () => {
const data = { table1: [{ big: "data" }] };
const data = { table1: [{ big: 'data' }] }
for (let i = 1; i < 10000; i++) {
data.table1.push(data.table1[0]);
data.table1.push(data.table1[0])
}
return data;
};
return data
}
export const sendArrTests = (adapter: SASjs): TestSuite => ({
name: "sendArr",
name: 'sendArr',
tests: [
{
title: "Absolute paths",
description: "Should work with absolute paths to SAS jobs",
title: 'Absolute paths',
description: 'Should work with absolute paths to SAS jobs',
test: () => {
return adapter.request("/Public/app/common/sendArr", stringData);
return adapter.request('/Public/app/common/sendArr', stringData)
},
assertion: (res: any) => {
return res.table1[0][0] === stringData.table1[0].col1;
return res.table1[0][0] === stringData.table1[0].col1
}
},
{
title: "Single string value",
description: "Should send an array with a single string value",
title: 'Single string value',
description: 'Should send an array with a single string value',
test: () => {
return adapter.request("common/sendArr", stringData);
return adapter.request('common/sendArr', stringData)
},
assertion: (res: any) => {
return res.table1[0][0] === stringData.table1[0].col1;
return res.table1[0][0] === stringData.table1[0].col1
}
},
{
title: "Long string value",
title: 'Long string value',
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: () => {
return adapter.request("common/sendArr", getLongStringData());
return adapter.request('common/sendArr', getLongStringData())
},
assertion: (res: any) => {
const longStringData = getLongStringData();
return res.table1[0][0] === longStringData.table1[0].col1;
const longStringData = getLongStringData()
return res.table1[0][0] === longStringData.table1[0].col1
}
},
{
title: "Overly long string value",
title: 'Overly long string value',
description:
"Should error out with long string values over 32765 characters",
'Should error out with long string values over 32765 characters',
test: () => {
const data = getLongStringData(32767);
return adapter.request("common/sendArr", data).catch((e) => e);
const data = getLongStringData(32767)
return adapter.request('common/sendArr', data).catch((e) => e)
},
assertion: (error: any) => {
return !!error && !!error.error && !!error.error.message;
return !!error && !!error.error && !!error.error.message
}
},
{
title: "Single numeric value",
description: "Should send an array with a single numeric value",
title: 'Single numeric value',
description: 'Should send an array with a single numeric value',
test: () => {
return adapter.request("common/sendArr", numericData);
return adapter.request('common/sendArr', numericData)
},
assertion: (res: any) => {
return res.table1[0][0] === numericData.table1[0].col1;
return res.table1[0][0] === numericData.table1[0].col1
}
},
{
title: "Multiple columns",
description: "Should handle data with multiple columns",
title: 'Multiple columns',
description: 'Should handle data with multiple columns',
test: () => {
return adapter.request("common/sendArr", multiColumnData);
return adapter.request('common/sendArr', multiColumnData)
},
assertion: (res: any) => {
return (
@@ -113,143 +114,141 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
res.table1[0][1] === multiColumnData.table1[0].col2 &&
res.table1[0][2] === multiColumnData.table1[0].col3 &&
res.table1[0][3] === multiColumnData.table1[0].col4
);
)
}
},
{
title: "Multiple rows with nulls",
description: "Should handle data with multiple rows with null values",
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('common/sendArr', multipleRowsWithNulls)
},
assertion: (res: any) => {
let result = true;
let result = true
multipleRowsWithNulls.table1.forEach((_: any, index: number) => {
result =
result &&
res.table1[index][0] === multipleRowsWithNulls.table1[index].col1;
res.table1[index][0] === multipleRowsWithNulls.table1[index].col1
result =
result &&
res.table1[index][1] === multipleRowsWithNulls.table1[index].col2;
res.table1[index][1] === multipleRowsWithNulls.table1[index].col2
result =
result &&
res.table1[index][2] === multipleRowsWithNulls.table1[index].col3;
result =
result &&
res.table1[index][3] === multipleRowsWithNulls.table1[index].col4;
});
return result;
}
},
{
title: "Multiple columns with nulls",
description: "Should handle data with multiple columns with null values",
test: () => {
return adapter.request("common/sendArr", multipleColumnsWithNulls);
},
assertion: (res: any) => {
let result = true;
multipleColumnsWithNulls.table1.forEach((_: any, index: number) => {
result =
result &&
res.table1[index][0] ===
multipleColumnsWithNulls.table1[index].col1;
result =
result &&
res.table1[index][1] ===
multipleColumnsWithNulls.table1[index].col2;
result =
result &&
res.table1[index][2] ===
multipleColumnsWithNulls.table1[index].col3;
res.table1[index][2] === multipleRowsWithNulls.table1[index].col3
result =
result &&
res.table1[index][3] ===
(multipleColumnsWithNulls.table1[index].col4 || "");
});
return result;
(multipleRowsWithNulls.table1[index].col4 || ' ')
})
return result
}
},
{
title: 'Multiple columns with nulls',
description: 'Should handle data with multiple columns with null values',
test: () => {
return adapter.request('common/sendArr', multipleColumnsWithNulls)
},
assertion: (res: any) => {
let result = true
multipleColumnsWithNulls.table1.forEach((_: any, index: number) => {
result =
result &&
res.table1[index][0] === multipleColumnsWithNulls.table1[index].col1
result =
result &&
res.table1[index][1] === multipleColumnsWithNulls.table1[index].col2
result =
result &&
res.table1[index][2] === multipleColumnsWithNulls.table1[index].col3
result =
result &&
res.table1[index][3] ===
(multipleColumnsWithNulls.table1[index].col4 || ' ')
})
return result
}
}
]
});
})
export const sendObjTests = (adapter: SASjs): TestSuite => ({
name: "sendObj",
name: 'sendObj',
tests: [
{
title: "Invalid column name",
description: "Should throw an error",
title: 'Invalid column name',
description: 'Should throw an error',
test: async () => {
const invalidData: any = {
"1 invalid table": [{ col1: 42 }]
};
return adapter.request("common/sendObj", invalidData).catch((e) => e);
'1 invalid table': [{ col1: 42 }]
}
return adapter.request('common/sendObj', invalidData).catch((e) => e)
},
assertion: (error: any) =>
!!error && !!error.error && !!error.error.message
},
{
title: "Single string value",
description: "Should send an object with a single string value",
title: 'Single string value',
description: 'Should send an object with a single string value',
test: () => {
return adapter.request("common/sendObj", stringData);
return adapter.request('common/sendObj', stringData)
},
assertion: (res: any) => {
return res.table1[0].COL1 === stringData.table1[0].col1;
return res.table1[0].COL1 === stringData.table1[0].col1
}
},
{
title: "Long string value",
title: 'Long string value',
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: () => {
return adapter.request("common/sendObj", getLongStringData());
return adapter.request('common/sendObj', getLongStringData())
},
assertion: (res: any) => {
const longStringData = getLongStringData();
return res.table1[0].COL1 === longStringData.table1[0].col1;
const longStringData = getLongStringData()
return res.table1[0].COL1 === longStringData.table1[0].col1
}
},
{
title: "Overly long string value",
title: 'Overly long string value',
description:
"Should error out with long string values over 32765 characters",
'Should error out with long string values over 32765 characters',
test: () => {
return adapter
.request("common/sendObj", getLongStringData(32767))
.catch((e) => e);
.request('common/sendObj', getLongStringData(32767))
.catch((e) => e)
},
assertion: (error: any) => {
return !!error && !!error.error && !!error.error.message;
return !!error && !!error.error && !!error.error.message
}
},
{
title: "Single numeric value",
description: "Should send an object with a single numeric value",
title: 'Single numeric value',
description: 'Should send an object with a single numeric value',
test: () => {
return adapter.request("common/sendObj", numericData);
return adapter.request('common/sendObj', numericData)
},
assertion: (res: any) => {
return res.table1[0].COL1 === numericData.table1[0].col1;
return res.table1[0].COL1 === numericData.table1[0].col1
}
},
{
title: "Large data volume",
description: "Should send an object with a large amount of data",
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('common/sendObj', getLargeObjectData())
},
assertion: (res: any) => {
const data = getLargeObjectData();
return res.table1[9000].BIG === data.table1[9000].big;
const data = getLargeObjectData()
return res.table1[9000].BIG === data.table1[9000].big
}
},
{
title: "Multiple columns",
description: "Should handle data with multiple columns",
title: 'Multiple columns',
description: 'Should handle data with multiple columns',
test: () => {
return adapter.request("common/sendObj", multiColumnData);
return adapter.request('common/sendObj', multiColumnData)
},
assertion: (res: any) => {
return (
@@ -257,62 +256,63 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
res.table1[0].COL2 === multiColumnData.table1[0].col2 &&
res.table1[0].COL3 === multiColumnData.table1[0].col3 &&
res.table1[0].COL4 === multiColumnData.table1[0].col4
);
)
}
},
{
title: "Multiple rows with nulls",
description: "Should handle data with multiple rows with null values",
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('common/sendObj', multipleRowsWithNulls)
},
assertion: (res: any) => {
let result = true;
let result = true
multipleRowsWithNulls.table1.forEach((_: any, index: number) => {
result =
result &&
res.table1[index].COL1 === multipleRowsWithNulls.table1[index].col1;
res.table1[index].COL1 === multipleRowsWithNulls.table1[index].col1
result =
result &&
res.table1[index].COL2 === multipleRowsWithNulls.table1[index].col2;
res.table1[index].COL2 === multipleRowsWithNulls.table1[index].col2
result =
result &&
res.table1[index].COL3 === multipleRowsWithNulls.table1[index].col3;
res.table1[index].COL3 === multipleRowsWithNulls.table1[index].col3
result =
result &&
res.table1[index].COL4 === multipleRowsWithNulls.table1[index].col4;
});
return result;
res.table1[index].COL4 ===
(multipleRowsWithNulls.table1[index].col4 || ' ')
})
return result
}
},
{
title: "Multiple columns with nulls",
description: "Should handle data with multiple columns with null values",
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('common/sendObj', multipleColumnsWithNulls)
},
assertion: (res: any) => {
let result = true;
let result = true
multipleColumnsWithNulls.table1.forEach((_: any, index: number) => {
result =
result &&
res.table1[index].COL1 ===
multipleColumnsWithNulls.table1[index].col1;
multipleColumnsWithNulls.table1[index].col1
result =
result &&
res.table1[index].COL2 ===
multipleColumnsWithNulls.table1[index].col2;
multipleColumnsWithNulls.table1[index].col2
result =
result &&
res.table1[index].COL3 ===
multipleColumnsWithNulls.table1[index].col3;
multipleColumnsWithNulls.table1[index].col3
result =
result &&
res.table1[index].COL4 ===
(multipleColumnsWithNulls.table1[index].col4 || "");
});
return result;
(multipleColumnsWithNulls.table1[index].col4 || ' ')
})
return result
}
}
]
});
})

View File

@@ -1,49 +1,49 @@
import SASjs from "@sasjs/adapter";
import { TestSuite } from "@sasjs/test-framework";
import SASjs from '@sasjs/adapter'
import { TestSuite } from '@sasjs/test-framework'
const data: any = { table1: [{ col1: "first col value" }] };
const data: any = { table1: [{ col1: 'first col value' }] }
export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
name: "SASjs Requests",
name: 'SASjs Requests',
tests: [
{
title: "WORK tables",
description: "Should get WORK tables after request",
title: 'WORK tables',
description: 'Should get WORK tables after request',
test: async () => {
return adapter.request("common/sendArr", data);
return adapter.request('common/sendArr', data)
},
assertion: () => {
const requests = adapter.getSasRequests();
const requests = adapter.getSasRequests()
if (adapter.getSasjsConfig().debug) {
return requests[0].SASWORK !== null;
return requests[0].SASWORK !== null
} else {
return requests[0].SASWORK === null;
return requests[0].SASWORK === null
}
}
},
{
title: "Make error and capture log",
title: 'Make error and capture log',
description:
"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 () => {
return adapter
.request("common/makeErr", data, { debug: true })
.request('common/makeErr', data, { debug: true })
.catch(() => {
const sasRequests = adapter.getSasRequests();
const sasRequests = adapter.getSasRequests()
const makeErrRequest: any =
sasRequests.find((req) => req.serviceLink.includes("makeErr")) ||
null;
sasRequests.find((req) => req.serviceLink.includes('makeErr')) ||
null
if (!makeErrRequest) return false;
if (!makeErrRequest) return false
return !!(
makeErrRequest.logFile && makeErrRequest.logFile.length > 0
);
});
)
})
},
assertion: (response) => {
return response;
return response
}
}
]
});
})

View File

@@ -1,91 +1,92 @@
import SASjs from "@sasjs/adapter";
import { TestSuite } from "@sasjs/test-framework";
import SASjs from '@sasjs/adapter'
import { TestSuite } from '@sasjs/test-framework'
const specialCharData: any = {
table1: [
{
tab: "\t",
lf: "\n",
cr: "\r",
semicolon: ";semi",
percent: "%",
tab: '\t',
lf: '\n',
cr: '\r',
semicolon: ';semi',
percent: '%',
singleQuote: "'",
doubleQuote: '"',
crlf: "\r\n",
euro: "€euro",
banghash: "!#banghash"
crlf: '\r\n',
euro: '€euro',
banghash: '!#banghash',
dot: '.'
}
]
};
}
const moreSpecialCharData: any = {
table1: [
{
speech0: '"speech',
pct: "%percent",
pct: '%percent',
speech: '"speech',
slash: "\\slash",
slashWithSpecial: "\\\tslash",
macvar: "&sysuserid",
chinese: "传/傳chinese",
sigma: "Σsigma",
at: "@at",
serbian: "Српски",
dollar: "$"
slash: '\\slash',
slashWithSpecial: '\\\tslash',
macvar: '&sysuserid',
chinese: '传/傳chinese',
sigma: 'Σsigma',
at: '@at',
serbian: 'Српски',
dollar: '$'
}
]
};
}
const getWideData = () => {
const cols: any = {};
const cols: any = {}
for (let i = 1; i <= 10000; i++) {
cols["col" + i] = "test" + i;
cols['col' + i] = 'test' + i
}
const data: any = {
table1: [cols]
};
}
return data;
};
return data
}
const getTables = () => {
const tables: any = {};
const tables: any = {}
for (let i = 1; i <= 100; i++) {
tables["table" + i] = [{ col1: "x", col2: "x", col3: "x", col4: "x" }];
tables['table' + i] = [{ col1: 'x', col2: 'x', col3: 'x', col4: 'x' }]
}
return tables;
};
return tables
}
const getLargeDataset = () => {
const rows: any = [];
const rows: any = []
const colData: string =
"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
for (let i = 1; i <= 10000; i++) {
rows.push({ col1: colData, col2: colData, col3: colData, col4: colData });
rows.push({ col1: colData, col2: colData, col3: colData, col4: colData })
}
const data: any = {
table1: rows
};
}
return data;
};
return data
}
const errorAndCsrfData: any = {
error: [{ col1: "q", col2: "w", col3: "e", col4: "r" }],
_csrf: [{ col1: "q", col2: "w", col3: "e", col4: "r" }]
};
error: [{ col1: 'q', col2: 'w', col3: 'e', col4: 'r' }],
_csrf: [{ col1: 'q', col2: 'w', col3: 'e', col4: 'r' }]
}
export const specialCaseTests = (adapter: SASjs): TestSuite => ({
name: "Special Cases",
name: 'Special Cases',
tests: [
{
title: "Common special characters",
description: "Should handle common special characters",
title: 'Common special characters',
description: 'Should handle common special characters',
test: () => {
return adapter.request("common/sendArr", specialCharData);
return adapter.request('common/sendArr', specialCharData)
},
assertion: (res: any) => {
return (
@@ -96,17 +97,18 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
res.table1[0][4] === specialCharData.table1[0].percent &&
res.table1[0][5] === specialCharData.table1[0].singleQuote &&
res.table1[0][6] === specialCharData.table1[0].doubleQuote &&
res.table1[0][7] === "\n" &&
res.table1[0][7] === '\n' &&
res.table1[0][8] === specialCharData.table1[0].euro &&
res.table1[0][9] === specialCharData.table1[0].banghash
);
res.table1[0][9] === specialCharData.table1[0].banghash &&
res.table1[0][10] === specialCharData.table1[0].dot
)
}
},
{
title: "Other special characters",
description: "Should handle other special characters",
title: 'Other special characters',
description: 'Should handle other special characters',
test: () => {
return adapter.request("common/sendArr", moreSpecialCharData);
return adapter.request('common/sendArr', moreSpecialCharData)
},
assertion: (res: any) => {
return (
@@ -121,50 +123,50 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
res.table1[0][8] === moreSpecialCharData.table1[0].at &&
res.table1[0][9] === moreSpecialCharData.table1[0].serbian &&
res.table1[0][10] === moreSpecialCharData.table1[0].dollar
);
)
}
},
{
title: "Wide table with sendArr",
description: "Should handle data with 10000 columns",
title: 'Wide table with sendArr',
description: 'Should handle data with 10000 columns',
test: () => {
return adapter.request("common/sendArr", getWideData());
return adapter.request('common/sendArr', getWideData())
},
assertion: (res: any) => {
const data = getWideData();
let result = true;
const data = getWideData()
let result = true
for (let i = 0; i <= 10; i++) {
result =
result && res.table1[0][i] === data.table1[0]["col" + (i + 1)];
result && res.table1[0][i] === data.table1[0]['col' + (i + 1)]
}
return result;
return result
}
},
{
title: "Wide table with sendObj",
description: "Should handle data with 10000 columns",
title: 'Wide table with sendObj',
description: 'Should handle data with 10000 columns',
test: () => {
return adapter.request("common/sendObj", getWideData());
return adapter.request('common/sendObj', getWideData())
},
assertion: (res: any) => {
const data = getWideData();
let result = true;
const data = getWideData()
let result = true
for (let i = 0; i <= 10; i++) {
result =
result &&
res.table1[0]["COL" + (i + 1)] === data.table1[0]["col" + (i + 1)];
res.table1[0]['COL' + (i + 1)] === data.table1[0]['col' + (i + 1)]
}
return result;
return result
}
},
{
title: "Multiple tables",
description: "Should handle data with 100 tables",
title: 'Multiple tables',
description: 'Should handle data with 100 tables',
test: () => {
return adapter.request("common/sendArr", getTables());
return adapter.request('common/sendArr', getTables())
},
assertion: (res: any) => {
const data = getTables();
const data = getTables()
return (
res.table1[0][0] === data.table1[0].col1 &&
res.table1[0][1] === data.table1[0].col2 &&
@@ -174,45 +176,45 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
res.table50[0][1] === data.table50[0].col2 &&
res.table50[0][2] === data.table50[0].col3 &&
res.table50[0][3] === data.table50[0].col4
);
)
}
},
{
title: "Large dataset with sendObj",
description: "Should handle 5mb of data",
title: 'Large dataset with sendObj',
description: 'Should handle 5mb of data',
test: () => {
return adapter.request("common/sendObj", getLargeDataset());
return adapter.request('common/sendObj', getLargeDataset())
},
assertion: (res: any) => {
const data = getLargeDataset();
let result = true;
const data = getLargeDataset()
let result = true
for (let i = 0; i <= 10; i++) {
result = result && res.table1[i][0] === data.table1[i][0];
result = result && res.table1[i][0] === data.table1[i][0]
}
return result;
return result
}
},
{
title: "Large dataset with sendArr",
description: "Should handle 5mb of data",
title: 'Large dataset with sendArr',
description: 'Should handle 5mb of data',
test: () => {
return adapter.request("common/sendArr", getLargeDataset());
return adapter.request('common/sendArr', getLargeDataset())
},
assertion: (res: any) => {
const data = getLargeDataset();
let result = true;
const data = getLargeDataset()
let result = true
for (let i = 0; i <= 10; i++) {
result =
result && res.table1[i][0] === Object.values(data.table1[i])[0];
result && res.table1[i][0] === Object.values(data.table1[i])[0]
}
return result;
return result
}
},
{
title: "Error and _csrf tables with sendArr",
description: "Should handle error and _csrf tables",
title: 'Error and _csrf tables with sendArr',
description: 'Should handle error and _csrf tables',
test: () => {
return adapter.request("common/sendArr", errorAndCsrfData);
return adapter.request('common/sendArr', errorAndCsrfData)
},
assertion: (res: any) => {
return (
@@ -224,14 +226,14 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
res._csrf[0][1] === errorAndCsrfData._csrf[0].col2 &&
res._csrf[0][2] === errorAndCsrfData._csrf[0].col3 &&
res._csrf[0][3] === errorAndCsrfData._csrf[0].col4
);
)
}
},
{
title: "Error and _csrf tables with sendObj",
description: "Should handle error and _csrf tables",
title: 'Error and _csrf tables with sendObj',
description: 'Should handle error and _csrf tables',
test: () => {
return adapter.request("common/sendObj", errorAndCsrfData);
return adapter.request('common/sendObj', errorAndCsrfData)
},
assertion: (res: any) => {
return (
@@ -243,8 +245,8 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
res._csrf[0].COL2 === errorAndCsrfData._csrf[0].col2 &&
res._csrf[0].COL3 === errorAndCsrfData._csrf[0].col3 &&
res._csrf[0].COL4 === errorAndCsrfData._csrf[0].col4
);
)
}
}
]
});
})

View File

@@ -1,22 +1,22 @@
export const assert = (
expression: boolean | (() => boolean),
message = "Assertion failed"
message = 'Assertion failed'
) => {
let result;
let result
try {
if (typeof expression === "boolean") {
result = expression;
if (typeof expression === 'boolean') {
result = expression
} else {
result = expression();
result = expression()
}
} catch (e) {
console.error(message);
throw new Error(message);
console.error(message)
throw new Error(message)
}
if (!!result) {
return;
return
} else {
console.error(message);
throw new Error(message);
console.error(message)
throw new Error(message)
}
};
}

View File

@@ -314,9 +314,7 @@ export class ContextManager {
contextId: string,
accessToken?: string
): Promise<ContextAllAttributes> {
const {
result: context
} = await this.requestClient
const { result: context } = await this.requestClient
.get<ContextAllAttributes>(
`${this.serverUrl}/compute/contexts/${contextId}`,
accessToken

View File

@@ -1,6 +1,6 @@
import { isUrl } from './utils'
import { UploadFile } from './types/UploadFile'
import { ErrorResponse, LoginRequiredError } from './types'
import { ErrorResponse, LoginRequiredError } from './types/errors'
import { RequestClient } from './request/RequestClient'
export class FileUploader {

View File

@@ -1,4 +1,10 @@
import { convertToCSV, isRelativePath, isUri, isUrl } from './utils'
import {
convertToCSV,
isRelativePath,
isUri,
isUrl,
fetchLogByChunks
} from './utils'
import * as NodeFormData from 'form-data'
import {
Job,
@@ -8,10 +14,13 @@ import {
Folder,
EditContextInput,
JobDefinition,
PollOptions,
ComputeJobExecutionError,
JobExecutionError
PollOptions
} from './types'
import {
ComputeJobExecutionError,
JobExecutionError,
NotFoundError
} from './types/errors'
import { formatDataForRequest } from './utils/formatDataForRequest'
import { SessionManager } from './SessionManager'
import { ContextManager } from './ContextManager'
@@ -19,7 +28,6 @@ import { timestampToYYYYMMDDHHMMSS } from '@sasjs/utils/time'
import { Logger, LogLevel } from '@sasjs/utils/logger'
import { isAuthorizeFormRequired } from './auth/isAuthorizeFormRequired'
import { RequestClient } from './request/RequestClient'
import { NotFoundError } from './types/NotFoundError'
import { SasAuthResponse } from '@sasjs/utils/types'
import { prefixMessage } from '@sasjs/utils/error'
@@ -404,7 +412,22 @@ export class SASViyaApiClient {
etag,
accessToken,
pollOptions
).catch((err) => {
).catch(async (err) => {
const error = err?.response?.data
const result = /err=[0-9]*,/.exec(error)
const errorCode = '5113'
if (result?.[0]?.slice(4, -1) === errorCode) {
const sessionLogUrl =
postedJob.links.find((l: any) => l.rel === 'up')!.href + '/log'
const logCount = 1000000
err.log = await fetchLogByChunks(
this.requestClient,
accessToken!,
sessionLogUrl,
logCount
)
}
throw prefixMessage(err, 'Error while polling job status. ')
})
@@ -418,19 +441,19 @@ export class SASViyaApiClient {
})
let jobResult
let log
let log = ''
const logLink = currentJob.links.find((l) => l.rel === 'log')
if (debug && logLink) {
log = await this.requestClient
.get<any>(`${logLink.href}/content?limit=10000`, accessToken)
.then((res: any) =>
res.result.items.map((i: any) => i.line).join('\n')
)
.catch((err) => {
throw prefixMessage(err, 'Error while getting log. ')
})
const logUrl = `${logLink.href}/content`
const logCount = currentJob.logStatistics?.lineCount ?? 1000000
log = await fetchLogByChunks(
this.requestClient,
accessToken!,
logUrl,
logCount
)
}
if (jobStatus === 'failed' || jobStatus === 'error') {
@@ -451,14 +474,14 @@ export class SASViyaApiClient {
.catch(async (e) => {
if (e instanceof NotFoundError) {
if (logLink) {
log = await this.requestClient
.get<any>(`${logLink.href}/content?limit=10000`, accessToken)
.then((res: any) =>
res.result.items.map((i: any) => i.line).join('\n')
)
.catch((err) => {
throw prefixMessage(err, 'Error while getting log. ')
})
const logUrl = `${logLink.href}/content`
const logCount = currentJob.logStatistics?.lineCount ?? 1000000
log = await fetchLogByChunks(
this.requestClient,
accessToken!,
logUrl,
logCount
)
return Promise.reject({
status: 500,
@@ -571,16 +594,15 @@ export class SASViyaApiClient {
}
}
const {
result: createFolderResponse
} = await this.requestClient.post<Folder>(
`/folders/folders?parentFolderUri=${parentFolderUri}`,
{
name: folderName,
type: 'folder'
},
accessToken
)
const { result: createFolderResponse } =
await this.requestClient.post<Folder>(
`/folders/folders?parentFolderUri=${parentFolderUri}`,
{
name: folderName,
type: 'folder'
},
accessToken
)
// update folder map with newly created folder.
await this.populateFolderMap(
@@ -852,9 +874,7 @@ export class SASViyaApiClient {
throw new Error(`URI of job definition was not found.`)
}
const {
result: jobDefinition
} = await this.requestClient
const { result: jobDefinition } = await this.requestClient
.get<JobDefinition>(
`${this.serverUrl}${jobDefinitionLink.href}`,
accessToken
@@ -1058,6 +1078,7 @@ export class SASViyaApiClient {
) {
let POLL_INTERVAL = 300
let MAX_POLL_COUNT = 1000
let MAX_ERROR_COUNT = 5
if (pollOptions) {
POLL_INTERVAL = pollOptions.POLL_INTERVAL || POLL_INTERVAL
@@ -1066,6 +1087,7 @@ export class SASViyaApiClient {
let postedJobState = ''
let pollCount = 0
let errorCount = 0
const headers: any = {
'Content-Type': 'application/json',
'If-None-Match': etag
@@ -1080,12 +1102,18 @@ export class SASViyaApiClient {
const { result: state } = await this.requestClient
.get<string>(
`${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
`${this.serverUrl}${stateLink.href}?_action=wait&wait=300`,
accessToken,
'text/plain'
'text/plain',
{},
this.debug
)
.catch((err) => {
throw prefixMessage(err, 'Error while getting job state. ')
console.error(
`Error fetching job state from ${this.serverUrl}${stateLink.href}. Starting poll, assuming job to be running.`,
err
)
return { result: 'unavailable' }
})
const currentState = state.trim()
@@ -1100,23 +1128,40 @@ export class SASViyaApiClient {
if (
postedJobState === 'running' ||
postedJobState === '' ||
postedJobState === 'pending'
postedJobState === 'pending' ||
postedJobState === 'unavailable'
) {
if (stateLink) {
const { result: jobState } = await this.requestClient
.get<string>(
`${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
`${this.serverUrl}${stateLink.href}?_action=wait&wait=300`,
accessToken,
'text/plain'
'text/plain',
{},
this.debug
)
.catch((err) => {
throw prefixMessage(
err,
'Error while getting job state after interval. '
errorCount++
if (
pollCount >= MAX_POLL_COUNT ||
errorCount >= MAX_ERROR_COUNT
) {
throw prefixMessage(
err,
'Error while getting job state after interval. '
)
}
console.error(
`Error fetching job state from ${this.serverUrl}${stateLink.href}. Resuming poll, assuming job to be running.`,
err
)
return { result: 'unavailable' }
})
postedJobState = jobState.trim()
if (postedJobState != 'unavailable' && errorCount > 0) {
errorCount = 0
}
if (this.debug && printedState !== postedJobState) {
console.log('Polling job status...')

View File

@@ -12,6 +12,7 @@ import {
ComputeJobExecutor,
JesJobExecutor
} from './job-execution'
import { ErrorResponse } from './types/errors'
const defaultConfig: SASjsConfig = {
serverUrl: '',
@@ -530,15 +531,19 @@ export default class SASjs {
* @param config - provide any changes to the config here, for instance to
* enable/disable `debug`. Any change provided will override the global config,
* for that particular function call.
* @param loginRequiredCallback - provide a function here to be called if the
* @param loginRequiredCallback - a function that is called if the
* user is not logged in (eg to display a login form). The request will be
* resubmitted after logon.
* resubmitted after successful login.
* When using a `loginRequiredCallback`, the call to the request will look, for example, like so:
* `await request(sasJobPath, data, config, () => setIsLoggedIn(false))`
* If you are not passing in any data and configuration, it will look like so:
* `await request(sasJobPath, {}, {}, () => setIsLoggedIn(false))`
*/
public async request(
sasJob: string,
data: any,
config: any = {},
loginRequiredCallback?: any,
data: { [key: string]: any },
config: { [key: string]: any } = {},
loginRequiredCallback?: () => any,
accessToken?: string
) {
config = {
@@ -705,9 +710,27 @@ export default class SASjs {
* @param accessToken - an access token for an authorized user.
*/
public async fetchLogFileContent(logUrl: string, accessToken?: string) {
return await this.requestClient!.get(logUrl, accessToken).then((res) =>
JSON.stringify(res.result)
)
return await this.requestClient!.get(logUrl, accessToken).then((res) => {
if (!res)
return Promise.reject(
new ErrorResponse(
'Error while fetching log. Response was not provided.'
)
)
try {
const result = JSON.stringify(res.result)
return result
} catch (err) {
return Promise.reject(
new ErrorResponse(
'Error while fetching log. The result is not valid.',
err
)
)
}
})
}
public getSasRequests() {

View File

@@ -91,10 +91,7 @@ export class SessionManager {
}
private async createAndWaitForSession(accessToken?: string) {
const {
result: createdSession,
etag
} = await this.requestClient
const { result: createdSession, etag } = await this.requestClient
.post<Session>(
`${this.serverUrl}/compute/contexts/${
this.currentContext!.id

View File

@@ -82,17 +82,33 @@ export class AuthManager {
* @returns - a promise which resolves with an object containing two values - a boolean `isLoggedIn`, and a string `userName`.
*/
public async checkSession() {
const { result: loginResponse } = await this.requestClient.get<string>(
this.loginUrl.replace('.do', ''),
undefined,
'text/plain'
)
const responseText = loginResponse
const isLoggedIn = /<button.+onClick.+logout/gm.test(responseText)
let loginForm: any = null
//For VIYA we will send request on API endpoint. Which is faster then pinging SASJobExecution.
//For SAS9 we will send request on SASStoredProcess
const url =
this.serverType === 'SASVIYA'
? `${this.serverUrl}/identities`
: `${this.serverUrl}/SASStoredProcess`
const { result: loginResponse } = await this.requestClient
.get<string>(url, undefined, 'text/plain')
.catch((err: any) => {
return { result: 'authErr' }
})
const isLoggedIn = loginResponse !== 'authErr'
let loginForm = null
if (!isLoggedIn) {
loginForm = await this.getLoginForm(responseText)
//We will logout to make sure cookies are removed and login form is presented
this.logOut()
const { result: formResponse } = await this.requestClient.get<string>(
this.loginUrl.replace('.do', ''),
undefined,
'text/plain'
)
loginForm = await this.getLoginForm(formResponse)
}
return Promise.resolve({

View File

@@ -176,41 +176,19 @@ describe('AuthManager', () => {
const response = await authManager.checkSession()
expect(response.isLoggedIn).toBeTruthy()
expect(mockedAxios.get).toHaveBeenNthCalledWith(1, `/SASLogon/login`, {
withCredentials: true,
responseType: 'text',
transformResponse: undefined,
headers: {
Accept: '*/*',
'Content-Type': 'text/plain'
expect(mockedAxios.get).toHaveBeenNthCalledWith(
1,
`http://test-server.com/identities`,
{
withCredentials: true,
responseType: 'text',
transformResponse: undefined,
headers: {
Accept: '*/*',
'Content-Type': 'text/plain'
}
}
})
done()
})
it('should check and return session information if logged in', async (done) => {
const authManager = new AuthManager(
serverUrl,
serverType,
requestClient,
authCallback
)
mockedAxios.get.mockImplementation(() =>
Promise.resolve({ data: '<button onClick="logout">' })
)
const response = await authManager.checkSession()
expect(response.isLoggedIn).toBeTruthy()
expect(mockedAxios.get).toHaveBeenNthCalledWith(1, `/SASLogon/login`, {
withCredentials: true,
responseType: 'text',
transformResponse: undefined,
headers: {
Accept: '*/*',
'Content-Type': 'text/plain'
}
})
done()
})

View File

@@ -1,5 +1,6 @@
import SASjs from './SASjs'
export * from './types'
export * from './types/errors'
export * from './SASViyaApiClient'
export * from './SAS9ApiClient'
export default SASjs

View File

@@ -1,7 +1,10 @@
import { ServerType } from '@sasjs/utils/types'
import { ErrorResponse } from '..'
import { SASViyaApiClient } from '../SASViyaApiClient'
import { ComputeJobExecutionError, LoginRequiredError } from '../types'
import {
ErrorResponse,
ComputeJobExecutionError,
LoginRequiredError
} from '../types/errors'
import { BaseJobExecutor } from './JobExecutor'
export class ComputeJobExecutor extends BaseJobExecutor {

View File

@@ -1,7 +1,10 @@
import { ServerType } from '@sasjs/utils/types'
import { ErrorResponse } from '..'
import { SASViyaApiClient } from '../SASViyaApiClient'
import { JobExecutionError, LoginRequiredError } from '../types'
import {
ErrorResponse,
JobExecutionError,
LoginRequiredError
} from '../types/errors'
import { BaseJobExecutor } from './JobExecutor'
export class JesJobExecutor extends BaseJobExecutor {
@@ -30,7 +33,7 @@ export class JesJobExecutor extends BaseJobExecutor {
.then((response) => {
this.appendRequest(response, sasJob, config.debug)
resolve(response.result)
resolve(response)
})
.catch(async (e: Error) => {
if (e instanceof JobExecutionError) {

View File

@@ -1,5 +1,9 @@
import { ServerType } from '@sasjs/utils/types'
import { ErrorResponse, JobExecutionError, LoginRequiredError } from '..'
import {
ErrorResponse,
JobExecutionError,
LoginRequiredError
} from '../types/errors'
import { generateFileUploadForm } from '../file/generateFileUploadForm'
import { generateTableUploadForm } from '../file/generateTableUploadForm'
import { RequestClient } from '../request/RequestClient'
@@ -67,10 +71,8 @@ export class WebJobExecutor extends BaseJobExecutor {
} else {
// param based approach
try {
const {
formData: newFormData,
requestParams: params
} = generateTableUploadForm(formData, data)
const { formData: newFormData, requestParams: params } =
generateTableUploadForm(formData, data)
formData = newFormData
requestParams = { ...requestParams, ...params }
} catch (e) {

View File

@@ -1,9 +1,13 @@
import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios'
import { CsrfToken, JobExecutionError } from '..'
import { CsrfToken } from '..'
import { isAuthorizeFormRequired, isLogInRequired } from '../auth'
import { LoginRequiredError } from '../types'
import { AuthorizeError } from '../types/AuthorizeError'
import { NotFoundError } from '../types/NotFoundError'
import {
AuthorizeError,
LoginRequiredError,
NotFoundError,
InternalServerError,
JobExecutionError
} from '../types/errors'
import { parseWeboutResponse } from '../utils/parseWeboutResponse'
import { prefixMessage } from '@sasjs/utils/error'
@@ -73,7 +77,8 @@ export class RequestClient implements HttpClient {
url: string,
accessToken: string | undefined,
contentType: string = 'application/json',
overrideHeaders: { [key: string]: string | number } = {}
overrideHeaders: { [key: string]: string | number } = {},
debug: boolean = false
): Promise<{ result: T; etag: string }> {
const headers = {
...this.getHeaders(accessToken, contentType),
@@ -97,15 +102,18 @@ export class RequestClient implements HttpClient {
return this.parseResponse<T>(response)
})
.catch(async (e) => {
return await this.handleError(e, () =>
this.get<T>(url, accessToken, contentType, overrideHeaders).catch(
(err) => {
throw prefixMessage(
err,
'Error while executing handle error callback. '
)
}
)
return await this.handleError(
e,
() =>
this.get<T>(url, accessToken, contentType, overrideHeaders).catch(
(err) => {
throw prefixMessage(
err,
'Error while executing handle error callback. '
)
}
),
debug
).catch((err) => {
throw prefixMessage(err, 'Error while handling error. ')
})
@@ -206,9 +214,8 @@ export class RequestClient implements HttpClient {
const headers = this.getHeaders(accessToken, 'application/json')
if (this.fileUploadCsrfToken?.value) {
headers[
this.fileUploadCsrfToken.headerName
] = this.fileUploadCsrfToken.value
headers[this.fileUploadCsrfToken.headerName] =
this.fileUploadCsrfToken.value
}
try {
@@ -325,9 +332,9 @@ export class RequestClient implements HttpClient {
}
private parseCsrfToken = (response: AxiosResponse): CsrfToken | undefined => {
const tokenHeader = (response.headers[
'x-csrf-header'
] as string)?.toLowerCase()
const tokenHeader = (
response.headers['x-csrf-header'] as string
)?.toLowerCase()
if (tokenHeader) {
const token = response.headers[tokenHeader]
@@ -340,7 +347,11 @@ export class RequestClient implements HttpClient {
}
}
private handleError = async (e: any, callback: any) => {
private handleError = async (
e: any,
callback: any,
debug: boolean = false
) => {
const response = e.response as AxiosResponse
if (e instanceof AuthorizeError) {
@@ -386,10 +397,11 @@ export class RequestClient implements HttpClient {
throw e
} else if (response?.status === 404) {
throw new NotFoundError(response.config.url!)
} else if (response?.status === 502) {
if (debug) throw new InternalServerError()
else return
}
console.log(`[e]`, e)
throw e
}
@@ -458,8 +470,6 @@ const throwIfError = (response: AxiosResponse) => {
throw new AuthorizeError(response.data.message, authorizeRequestUrl)
}
console.log(`[response]`, response)
const error = parseError(response.data as string)
if (error) {

View File

@@ -0,0 +1,39 @@
import { isUrl } from '../../utils/isUrl'
describe('urlValidator', () => {
it('should return true with an HTTP URL', () => {
const url = 'http://google.com'
expect(isUrl(url)).toEqual(true)
})
it('should return true with an HTTPS URL', () => {
const url = 'https://google.com'
expect(isUrl(url)).toEqual(true)
})
it('should return true when the URL is blank', () => {
const url = ''
expect(isUrl(url)).toEqual(false)
})
it('should return false when the URL has not supported protocol', () => {
const url = 'htpps://google.com'
expect(isUrl(url)).toEqual(false)
})
it('should return false when the URL is null', () => {
const url = null
expect(isUrl(url as unknown as string)).toEqual(false)
})
it('should return false when the URL is undefined', () => {
const url = undefined
expect(isUrl(url as unknown as string)).toEqual(false)
})
})

View File

@@ -1,5 +1,6 @@
import { Link } from './Link'
import { JobResult } from './JobResult'
import { LogStatistics } from './LogStatistics'
export interface Job {
id: string
@@ -10,4 +11,5 @@ export interface Job {
links: Link[]
results: JobResult
error?: any
logStatistics: LogStatistics
}

View File

@@ -0,0 +1,4 @@
export interface LogStatistics {
lineCount: number
modifiedTimeStamp: string
}

View File

@@ -1,4 +1,4 @@
import { Job } from './Job'
import { Job } from '../Job'
export class ComputeJobExecutionError extends Error {
constructor(public job: Job, public log: string) {

View File

@@ -0,0 +1,9 @@
export class InternalServerError extends Error {
constructor() {
super('Error: Internal server error.')
this.name = 'InternalServerError'
Object.setPrototypeOf(this, InternalServerError.prototype)
}
}

View File

@@ -0,0 +1,7 @@
export * from './AuthorizeError'
export * from './ComputeJobExecutionError'
export * from './InternalServerError'
export * from './JobExecutionError'
export * from './LoginRequiredError'
export * from './NotFoundError'
export * from './ErrorResponse'

View File

@@ -1,14 +1,10 @@
export * from './ComputeJobExecutionError'
export * from './Context'
export * from './CsrfToken'
export * from './ErrorResponse'
export * from './Folder'
export * from './Job'
export * from './JobExecutionError'
export * from './JobDefinition'
export * from './JobResult'
export * from './Link'
export * from './LoginRequiredError'
export * from './SASjsConfig'
export * from './SASjsRequest'
export * from './Session'

View File

@@ -0,0 +1,170 @@
import { convertToCSV } from './convertToCsv'
describe('convertToCsv', () => {
it('should convert single quoted values', () => {
const data = [
{ foo: `'bar'`, bar: 'abc' },
{ foo: 'sadf', bar: 'def' },
{ foo: 'asd', bar: `'qwert'` }
]
const expectedOutput = `foo:$char5. bar:$char7.\r\n"'bar'",abc\r\nsadf,def\r\nasd,"'qwert'"`
expect(convertToCSV(data)).toEqual(expectedOutput)
})
it('should convert double quoted values', () => {
const data = [
{ foo: `"bar"`, bar: 'abc' },
{ foo: 'sadf', bar: 'def' },
{ foo: 'asd', bar: `"qwert"` }
]
const expectedOutput = `foo:$char5. bar:$char7.\r\n"""bar""",abc\r\nsadf,def\r\nasd,"""qwert"""`
expect(convertToCSV(data)).toEqual(expectedOutput)
})
it('should convert values with mixed quotes', () => {
const data = [{ foo: `'blah'`, bar: `"blah"` }]
const expectedOutput = `foo:$char6. bar:$char6.\r\n"'blah'","""blah"""`
expect(convertToCSV(data)).toEqual(expectedOutput)
})
it('should convert values with mixed quotes', () => {
const data = [{ foo: `'blah,"'`, bar: `"blah,blah" "` }]
const expectedOutput = `foo:$char8. bar:$char13.\r\n"'blah,""'","""blah,blah"" """`
expect(convertToCSV(data)).toEqual(expectedOutput)
})
it('should convert values with mixed quotes', () => {
const data = [{ foo: `',''`, bar: `","` }]
const expectedOutput = `foo:$char4. bar:$char3.\r\n"',''",""","""`
expect(convertToCSV(data)).toEqual(expectedOutput)
})
it('should convert values with mixed quotes', () => {
const data = [{ foo: `','`, bar: `,"` }]
const expectedOutput = `foo:$char3. bar:$char2.\r\n"','",","""`
expect(convertToCSV(data)).toEqual(expectedOutput)
})
it('should convert values with mixed quotes', () => {
const data = [{ foo: `"`, bar: `'` }]
const expectedOutput = `foo:$char1. bar:$char1.\r\n"""","'"`
expect(convertToCSV(data)).toEqual(expectedOutput)
})
it('should convert values with mixed quotes', () => {
const data = [{ foo: `,`, bar: `',` }]
const expectedOutput = `foo:$char1. bar:$char2.\r\n",","',"`
expect(convertToCSV(data)).toEqual(expectedOutput)
})
it('should convert values with number cases 1', () => {
const data = [
{ col1: 42, col2: null, col3: 'x', col4: null },
{ col1: 42, col2: null, col3: 'x', col4: null },
{ col1: 42, col2: null, col3: 'x', col4: null },
{ col1: 42, col2: null, col3: 'x', col4: '' },
{ col1: 42, col2: null, col3: 'x', col4: '' }
]
const expectedOutput = `col1:best. col2:best. col3:$char1. col4:$char1.\r\n42,.,x,\r\n42,.,x,\r\n42,.,x,\r\n42,.,x,\r\n42,.,x,`
expect(convertToCSV(data)).toEqual(expectedOutput)
})
it('should convert values with number cases 2', () => {
const data = [
{ col1: 42, col2: null, col3: 'x', col4: '' },
{ col1: 42, col2: null, col3: 'x', col4: '' },
{ col1: 42, col2: null, col3: 'x', col4: '' },
{ col1: 42, col2: 1.62, col3: 'x', col4: 'x' },
{ col1: 42, col2: 1.62, col3: 'x', col4: 'x' }
]
const expectedOutput = `col1:best. col2:best. col3:$char1. col4:$char1.\r\n42,.,x,\r\n42,.,x,\r\n42,.,x,\r\n42,1.62,x,x\r\n42,1.62,x,x`
expect(convertToCSV(data)).toEqual(expectedOutput)
})
it('should convert values with common special characters', () => {
expect(convertToCSV([{ tab: '\t' }])).toEqual(`tab:$char1.\r\n\"\t\"`)
expect(convertToCSV([{ lf: '\n' }])).toEqual(`lf:$char1.\r\n\"\n\"`)
expect(convertToCSV([{ semicolon: ';semi' }])).toEqual(
`semicolon:$char5.\r\n;semi`
)
expect(convertToCSV([{ percent: '%' }])).toEqual(`percent:$char1.\r\n%`)
expect(convertToCSV([{ singleQuote: "'" }])).toEqual(
`singleQuote:$char1.\r\n\"'\"`
)
expect(convertToCSV([{ doubleQuote: '"' }])).toEqual(
`doubleQuote:$char1.\r\n""""`
)
expect(convertToCSV([{ crlf: '\r\n' }])).toEqual(`crlf:$char2.\r\n\"\n\"`)
expect(convertToCSV([{ euro: '€euro' }])).toEqual(`euro:$char7.\r\n€euro`)
expect(convertToCSV([{ banghash: '!#banghash' }])).toEqual(
`banghash:$char10.\r\n!#banghash`
)
})
it('should convert values with other special characters', () => {
const data = [
{
speech0: '"speech',
pct: '%percent',
speech: '"speech',
slash: '\\slash',
slashWithSpecial: '\\\tslash',
macvar: '&sysuserid',
chinese: '传/傳chinese',
sigma: 'Σsigma',
at: '@at',
serbian: 'Српски',
dollar: '$'
}
]
const expectedOutput = `speech0:$char7. pct:$char8. speech:$char7. slash:$char6. slashWithSpecial:$char7. macvar:$char10. chinese:$char14. sigma:$char7. at:$char3. serbian:$char12. dollar:$char1.\r\n"""speech",%percent,"""speech",\\slash,\"\\\tslash\",&sysuserid,传/傳chinese,Σsigma,@at,Српски,$`
expect(convertToCSV(data)).toEqual(expectedOutput)
expect(convertToCSV([{ speech: 'menext' }])).toEqual(
`speech:$char6.\r\nmenext`
)
expect(convertToCSV([{ speech: 'me\nnext' }])).toEqual(
`speech:$char7.\r\n\"me\nnext\"`
)
expect(convertToCSV([{ speech: `me'next` }])).toEqual(
`speech:$char7.\r\n\"me'next\"`
)
expect(convertToCSV([{ speech: `me"next` }])).toEqual(
`speech:$char7.\r\n\"me""next\"`
)
expect(convertToCSV([{ speech: `me""next` }])).toEqual(
`speech:$char8.\r\n\"me""""next\"`
)
expect(convertToCSV([{ slashWithSpecial: '\\\tslash' }])).toEqual(
`slashWithSpecial:$char7.\r\n\"\\\tslash\"`
)
expect(convertToCSV([{ slashWithSpecial: '\\ \tslash' }])).toEqual(
`slashWithSpecial:$char8.\r\n\"\\ \tslash\"`
)
expect(
convertToCSV([{ slashWithSpecialExtra: '\\\ts\tl\ta\ts\t\th\t' }])
).toEqual(`slashWithSpecialExtra:$char13.\r\n\"\\\ts\tl\ta\ts\t\th\t\"`)
})
})

View File

@@ -1,6 +1,6 @@
/**
* Converts the given JSON object to a CSV string.
* @param data - the JSON object to convert.
* Converts the given JSON object array to a CSV string.
* @param data - the array of JSON objects to convert.
*/
export const convertToCSV = (data: any) => {
const replacer = (key: any, value: any) => (value === null ? '' : value)
@@ -37,15 +37,7 @@ export const convertToCSV = (data: any) => {
let byteSize
if (typeof row[field] === 'string') {
let doubleQuotesFound = row[field]
.split('')
.filter((char: any) => char === '"')
byteSize = getByteSize(row[field])
if (doubleQuotesFound.length > 0) {
byteSize += doubleQuotesFound.length
}
}
return byteSize
@@ -61,7 +53,7 @@ export const convertToCSV = (data: any) => {
)
}
return `${field}:${firstFoundType === 'chars' ? '$' : ''}${
return `${field}:${firstFoundType === 'chars' ? '$char' : ''}${
longestValueForField
? longestValueForField
: firstFoundType === 'chars'
@@ -73,35 +65,28 @@ export const convertToCSV = (data: any) => {
if (invalidString) {
return 'ERROR: LARGE STRING LENGTH'
}
csvTest = data.map((row: any) => {
const fields = Object.keys(row).map((fieldName, index) => {
let value
let containsSpecialChar = false
const currentCell = row[fieldName]
if (JSON.stringify(currentCell).search(/(\\t|\\n|\\r)/gm) > -1) {
value = currentCell.toString()
containsSpecialChar = true
} else {
value = JSON.stringify(currentCell, replacer)
}
if (typeof currentCell === 'number') return currentCell
value = value.replace(/\\\\/gm, '\\')
// stringify with replacer converts null values to empty strings
value = currentCell === null ? '' : currentCell
if (containsSpecialChar) {
if (value.includes(',') || value.includes('"')) {
value = '"' + value + '"'
}
} else {
if (
!value.includes(',') &&
value.includes('"') &&
!value.includes('\\"')
) {
value = value.substring(1, value.length - 1)
}
// if there any present, it should have preceding (") for escaping
value = value.replace(/"/g, `""`)
value = value.replace(/\\"/gm, '""')
// also wraps the value in double quotes
value = `"${value}"`
if (
value.substring(1, value.length - 1).search(/(\t|\n|\r|,|\'|\")/gm) < 0
) {
// Remove wrapping quotes for values that don't contain special characters
value = value.substring(1, value.length - 1)
}
value = value.replace(/\r\n/gm, '\n')

View File

@@ -0,0 +1,43 @@
import { RequestClient } from '../request/RequestClient'
import { prefixMessage } from '@sasjs/utils/error'
/**
* Fetches content of the log file
* @param {object} requestClient - client object of Request Client.
* @param {string} accessToken - an access token for an authorized user.
* @param {string} logUrl - url of the log file.
* @param {number} logCount- total number of log lines in file.
* @returns an string containing log lines.
*/
export const fetchLogByChunks = async (
requestClient: RequestClient,
accessToken: string,
logUrl: string,
logCount: number
): Promise<string> => {
let log: string = ''
const loglimit = logCount < 10000 ? logCount : 10000
let start = 0
do {
console.log(
`Fetching logs from line no: ${start + 1} to ${
start + loglimit
} of ${logCount}.`
)
const logChunkJson = await requestClient!
.get<any>(`${logUrl}?start=${start}&limit=${loglimit}`, accessToken)
.then((res: any) => res.result)
.catch((err) => {
throw prefixMessage(err, 'Error while getting log. ')
})
if (logChunkJson.items.length === 0) break
const logChunk = logChunkJson.items.map((i: any) => i.line).join('\n')
log += logChunk
start += loglimit
} while (start < logCount)
return log
}

View File

@@ -11,3 +11,4 @@ export * from './parseSasViyaLog'
export * from './serialize'
export * from './splitChunks'
export * from './parseWeboutResponse'
export * from './fetchLogByChunks'

View File

@@ -1,16 +1,17 @@
/**
* Checks if string is in URL format.
* @param url - string to check.
* @param str - string to check.
*/
export const isUrl = (url: string): boolean => {
const pattern = new RegExp(
'^(http://|https://)[a-z0-9]+([-.]{1}[a-z0-9]+)*.[a-z]{2,5}(:[0-9]{1,5})?(/.*)?$',
'gi'
)
export const isUrl = (str: string): boolean => {
const supportedProtocols = ['http:', 'https:']
if (pattern.test(url)) return true
else
throw new Error(
`'${url}' is not a valid url. An example of a valid url is 'http://valid-url.com'.`
)
try {
const url = new URL(str)
if (!supportedProtocols.includes(url.protocol)) return false
} catch (_) {
return false
}
return true
}