chore(release): 0.0.28

feat: default macros and bumping core

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.28](https://github.com/sasjs/server/compare/v0.0.27...v0.0.28) (2022-02-16)
+
+
+### Features
+
+* default macros and bumping core ([6f19d3d](https://github.com/sasjs/server/commit/6f19d3d0ea3815815f246a3e455495c72c8604c7))
+
+
+### Bug Fixes
+
+* moving core ([f10138b](https://github.com/sasjs/server/commit/f10138b0f2005a958f63cb3a8351e1afa52f086a))
+
+### [0.0.27](https://github.com/sasjs/server/compare/v0.0.26...v0.0.27) (2022-02-16)
+
+
+### Features
+
+* removing stpsrv_header and updating README with auth details ([d3674c7](https://github.com/sasjs/server/commit/d3674c7f9449d77977e482cd63ccdf7e974fa838))
+* **stp-execution:** add returnLog option to execution query ([bf5767e](https://github.com/sasjs/server/commit/bf5767eadfb87f7ed902659347a18361a6a6c74b))
+
 ### [0.0.26](https://github.com/sasjs/server/compare/v0.0.25...v0.0.26) (2022-02-14)
 
 

README.md

@@ -9,18 +9,19 @@ SASjs Server provides a NodeJS wrapper for calling the SAS binary executable. It
 One major benefit of using SASjs Server (alongside other components of the SASjs framework such as the [CLI](https://cli.sasjs.io), [Adapter](https://adapter.sasjs.io) and [Core](https://core.sasjs.io) library) is that the projects you create can be very easily ported to SAS 9 (Stored Process server) or Viya (Job Execution server).
 
 SASjs Server is available in two modes - Desktop (without authentication) and Server (with authentiation, and a database)
+
 ## Desktop Version
 
 ### Manual Installation
+
 Download the relevant package from the [releases](https://github.com/sasjs/server/releases) page
 
 Next, trigger by double clicking (windows) or executing from commandline.
 
 You are presented with two prompts:
 
-* Location of your `sas.exe` / `sas.sh` executable
-* Path to a filesystem location for Stored Programs and temporary files
-
+- Location of your `sas.exe` / `sas.sh` executable
+- Path to a filesystem location for Stored Programs and temporary files
 
 ## Programmatic Installation
 
@@ -33,7 +34,7 @@ unzip linux.zip
 
 The app can then be launched with `./api-linux` and prompts followed.
 
-When launching the app, it will make use of specific environment variables.  These can be set in the following places:
+When launching the app, it will make use of specific environment variables. These can be set in the following places:
 
 - Configured globally in /etc/environment file
 - Export in terminal or shell script (`export VAR=VALUE`)
@@ -50,26 +51,44 @@ DRIVE_PATH=./tmp
 
 Setting these prompts variables will avoid the need for prompts.
 
-Normally the server process will stop when your terminal dies. To keep it going you can use the npm package [forever](https://www.npmjs.com/package/forever) (`npm i -g forever`) as follows:
+Normally the server process will stop when your terminal dies. To keep it going you can use the npm package [pm2](https://www.npmjs.com/package/pm2) (`npm install pm2@latest -g`) as follows:
 
 ```bash
 export SAS_PATH=/opt/sas9/SASHome/SASFoundation/9.4/sasexe/sas
 export PORT=5001
 export DRIVE_PATH=./tmp
 
-forever start -c "./api-linux" ./
+pm2 start api-linux
 ```
 
-To get the log files:
+To get the logs (and some usefull commands):
+
 ```bash
-forever list
-# grap log file link
-tail -f LOGFILE
+pm2 [list|ls|status]
+pm2 logs
+pm2 logs --lines 200
 ```
 
-To stop:
+Managing processes:
 
 ```
-forever stop <pid>
+pm2 restart app_name
+pm2 reload app_name
+pm2 stop app_name
+pm2 delete app_name
 ```
 
+Instead of `app_name` you can pass:
+
+- `all` to act on all processes
+- `id` to act on a specific process id
+
+
+
+## Server Version
+
+The following credentials can be used for the initial connection to SASjs/server.  It is recommended to change these on first use.
+
+* CLIENTID:  `clientID1`
+* USERNAME:  `secretuser`
+* PASSWORD:  `secretpassword`

api/package-lock.json

@@ -8,7 +8,7 @@
       "name": "api",
       "version": "0.0.2",
       "dependencies": {
-        "@sasjs/core": "4.8.0",
+        "@sasjs/core": "4.9.0",
         "@sasjs/utils": "2.34.1",
         "bcryptjs": "^2.4.3",
         "cors": "^2.8.5",
@@ -1418,9 +1418,9 @@
       }
     },
     "node_modules/@sasjs/core": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.8.0.tgz",
-      "integrity": "sha512-go31UvPRzOqWJm2hkM+9/KQXIky9SA7bFMLa2d1dMfpdrX0XQyw+dcDM3jHD/agtcATWYJ9exJrET7Bkj148YQ=="
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.9.0.tgz",
+      "integrity": "sha512-zc1Ey0ylHt/eRZAfK0mVG3EqNyq//wLxbiguiK0R6FhVqwYFEkprs3IiLGZ5M9ttKs2rHRIjOe/ckklHm+6HNQ=="
     },
     "node_modules/@sasjs/utils": {
       "version": "2.34.1",
@@ -11132,9 +11132,9 @@
       }
     },
     "@sasjs/core": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.8.0.tgz",
-      "integrity": "sha512-go31UvPRzOqWJm2hkM+9/KQXIky9SA7bFMLa2d1dMfpdrX0XQyw+dcDM3jHD/agtcATWYJ9exJrET7Bkj148YQ=="
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.9.0.tgz",
+      "integrity": "sha512-zc1Ey0ylHt/eRZAfK0mVG3EqNyq//wLxbiguiK0R6FhVqwYFEkprs3IiLGZ5M9ttKs2rHRIjOe/ckklHm+6HNQ=="
     },
     "@sasjs/utils": {
       "version": "2.34.1",

api/package.json

@@ -43,7 +43,7 @@
   },
   "author": "4GL Ltd",
   "dependencies": {
-    "@sasjs/core": "4.8.0",
+    "@sasjs/core": "4.9.0",
     "@sasjs/utils": "2.34.1",
     "bcryptjs": "^2.4.3",
     "cors": "^2.8.5",

api/scripts/systemInit.sas

@@ -4,10 +4,24 @@
   @details This program is inserted into every sasjs/server program invocation,
   _before_ any user-provided content.
 
+  A number of useful CORE macros are also compiled below, so that they can be
+  available "out of the box".
+
   <h4> SAS Macros </h4>
   @li mcf_stpsrv_header.sas
+  @li mf_getuser.sas
+  @li mf_getvarlist.sas
+  @li mf_mkdir.sas
+  @li mf_nobs.sas
+  @li mf_uid.sas
+  @li mfs_httpheader.sas
+  @li mp_dirlist.sas
+  @li mp_ds2ddl.sas
+  @li mp_ds2md.sas
+  @li mp_getdbml.sas
+  @li mp_init.sas
+  @li mp_makedata.sas
+  @li mp_zip.sas
 
 **/
 
-
-%mcf_stpsrv_header(wrap=YES, insert_cmplib=YES)

api/src/controllers/drive.ts

@@ -153,7 +153,7 @@ export class DriveController {
 }
 
 const getFileTree = () => {
-  const tree = new ExecutionController().buildDirectorytree()
+  const tree = new ExecutionController().buildDirectoryTree()
   return { status: 'success', tree }
 }
 

api/src/controllers/internal/Execution.ts

@@ -5,11 +5,15 @@ import { readFile, fileExists, createFile, moveFile } from '@sasjs/utils'
 import { PreProgramVars, TreeNode } from '../../types'
 import { generateFileUploadSasCode, getTmpFilesFolderPath } from '../../utils'
 
+export interface ExecutionVars {
+  [key: string]: string | number | undefined
+}
+
 export class ExecutionController {
   async executeFile(
     programPath: string,
     preProgramVariables: PreProgramVars,
-    vars: { [key: string]: string | number | undefined },
+    vars: ExecutionVars,
     otherArgs?: any,
     returnJson?: boolean
   ) {
@@ -29,7 +33,7 @@ export class ExecutionController {
   async executeProgram(
     program: string,
     preProgramVariables: PreProgramVars,
-    vars: { [key: string]: string | number | undefined },
+    vars: ExecutionVars,
     otherArgs?: any,
     returnJson?: boolean
   ) {
@@ -55,6 +59,7 @@ export class ExecutionController {
         `${computed}%let ${key}=${vars[key]};\n`,
       ''
     )
+
     const preProgramVarStatments = `
 %let _sasjs_tokenfile=${tokenFile};
 %let _sasjs_username=${preProgramVariables?.username};
@@ -138,7 +143,7 @@ ${program}`
       : webout
   }
 
-  buildDirectorytree() {
+  buildDirectoryTree() {
     const root: TreeNode = {
       name: 'files',
       relativePath: '',

api/src/controllers/internal/FileUploadController.ts

@@ -18,7 +18,7 @@ export class FileUploadController {
 
   //It will intercept request and generate unique uuid to be used as a subfolder name
   //that will store the files uploaded
-  public preuploadMiddleware = async (req: any, res: any, next: any) => {
+  public preUploadMiddleware = async (req: any, res: any, next: any) => {
     let session
 
     const sessionController = getSessionController()

api/src/controllers/stp.ts

@@ -1,7 +1,7 @@
 import express from 'express'
 import path from 'path'
 import { Request, Security, Route, Tags, Post, Body, Get, Query } from 'tsoa'
-import { ExecutionController } from './internal'
+import { ExecutionController, ExecutionVars } from './internal'
 import { PreProgramVars } from '../types'
 import { getTmpFilesFolderPath, makeFilesNamesMap } from '../utils'
 
@@ -66,7 +66,7 @@ const executeReturnRaw = async (
   req: express.Request,
   _program: string
 ): Promise<string> => {
-  const query = req.query as { [key: string]: string | number | undefined }
+  const query = req.query as ExecutionVars
   const sasCodePath =
     path
       .join(getTmpFilesFolderPath(), _program)

api/src/routes/api/session.ts

@@ -1,6 +1,5 @@
 import express from 'express'
 import { SessionController } from '../../controllers'
-import { authenticateAccessToken } from '../../middlewares'
 
 const sessionRouter = express.Router()
 

api/src/routes/api/stp.ts

@@ -1,5 +1,5 @@
 import express from 'express'
-import { executeProgramRawValidation, runSASValidation } from '../../utils'
+import { executeProgramRawValidation } from '../../utils'
 import { STPController } from '../../controllers/'
 import { FileUploadController } from '../../controllers/internal'
 
@@ -26,7 +26,7 @@ stpRouter.get('/execute', async (req, res) => {
 
 stpRouter.post(
   '/execute',
-  fileUploadController.preuploadMiddleware,
+  fileUploadController.preUploadMiddleware,
   fileUploadController.getMulterUploadObject().any(),
   async (req: any, res: any) => {
     const { error: errQ, value: query } = executeProgramRawValidation(req.query)

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "server",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "server",
-      "version": "0.0.26",
+      "version": "0.0.28",
       "devDependencies": {
         "prettier": "^2.3.1",
         "standard-version": "^9.3.2"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "description": "NodeJS wrapper for calling the SAS binary executable",
   "repository": "https://github.com/sasjs/server",
   "scripts": {