mirror of
https://github.com/sasjs/server.git
synced 2025-12-11 03:34:35 +00:00
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0f5c815c25 | ||
|
|
acccef1e99 | ||
| abc34ea047 | |||
| 71c429b093 | |||
|
|
c126f2d5d9 | ||
|
|
34dd95d16e | ||
| 1192583843 | |||
|
|
518815acf1 | ||
|
|
80b7e14ed5 | ||
| 23c997b3be | |||
| 39ba995355 |
22
CHANGELOG.md
22
CHANGELOG.md
@@ -1,3 +1,25 @@
|
||||
## [0.28.4](https://github.com/sasjs/server/compare/v0.28.3...v0.28.4) (2022-12-07)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* replace main class with container class ([71c429b](https://github.com/sasjs/server/commit/71c429b093b91e2444ae75d946579dccc2e48636))
|
||||
|
||||
## [0.28.3](https://github.com/sasjs/server/compare/v0.28.2...v0.28.3) (2022-12-06)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* stringify json file ([1192583](https://github.com/sasjs/server/commit/1192583843d7efd1a6ab6943207f394c3ae966be))
|
||||
|
||||
## [0.28.2](https://github.com/sasjs/server/compare/v0.28.1...v0.28.2) (2022-12-05)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* execute child process asyncronously ([23c997b](https://github.com/sasjs/server/commit/23c997b3beabeb6b733ae893031d2f1a48f28ad2))
|
||||
* JS / Python / R session folders should be NEW folders, not existing SAS folders ([39ba995](https://github.com/sasjs/server/commit/39ba995355daa24bb7ab22720f8fc57d2dc85f40))
|
||||
|
||||
## [0.28.1](https://github.com/sasjs/server/compare/v0.28.0...v0.28.1) (2022-11-28)
|
||||
|
||||
|
||||
|
||||
688
api/package-lock.json
generated
688
api/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -206,12 +206,15 @@ ${autoExecContent}`
|
||||
export const getSessionController = (
|
||||
runTime: RunTimeType
|
||||
): SessionController => {
|
||||
if (process.sessionController) return process.sessionController
|
||||
if (runTime === RunTimeType.SAS) {
|
||||
process.sasSessionController =
|
||||
process.sasSessionController || new SASSessionController()
|
||||
|
||||
return process.sasSessionController
|
||||
}
|
||||
|
||||
process.sessionController =
|
||||
runTime === RunTimeType.SAS
|
||||
? new SASSessionController()
|
||||
: new SessionController()
|
||||
process.sessionController || new SessionController()
|
||||
|
||||
return process.sessionController
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import path from 'path'
|
||||
import fs from 'fs'
|
||||
import { execFileSync } from 'child_process'
|
||||
import { WriteStream, createWriteStream } from 'fs'
|
||||
import { execFile } from 'child_process'
|
||||
import { once } from 'stream'
|
||||
import { createFile, moveFile } from '@sasjs/utils'
|
||||
import { PreProgramVars, Session } from '../../types'
|
||||
@@ -105,26 +105,58 @@ export const processProgram = async (
|
||||
throw new Error('Invalid runtime!')
|
||||
}
|
||||
|
||||
try {
|
||||
await createFile(codePath, program)
|
||||
await createFile(codePath, program)
|
||||
|
||||
// create a stream that will write to console outputs to log file
|
||||
const writeStream = fs.createWriteStream(logPath)
|
||||
// waiting for the open event so that we can have underlying file descriptor
|
||||
await once(writeStream, 'open')
|
||||
execFileSync(executablePath, [codePath], {
|
||||
stdio: ['ignore', writeStream, writeStream]
|
||||
// create a stream that will write to console outputs to log file
|
||||
const writeStream = createWriteStream(logPath)
|
||||
// waiting for the open event so that we can have underlying file descriptor
|
||||
await once(writeStream, 'open')
|
||||
|
||||
await execFilePromise(executablePath, [codePath], writeStream)
|
||||
.then(() => {
|
||||
session.completed = true
|
||||
process.logger.info('session completed', session)
|
||||
})
|
||||
// copy the code file to log and end write stream
|
||||
writeStream.end(program)
|
||||
session.completed = true
|
||||
process.logger.info('session completed', session)
|
||||
} catch (err: any) {
|
||||
session.completed = true
|
||||
session.crashed = err.toString()
|
||||
process.logger.error('session crashed', session.id, session.crashed)
|
||||
}
|
||||
.catch((err) => {
|
||||
session.completed = true
|
||||
session.crashed = err.toString()
|
||||
process.logger.error('session crashed', session.id, session.crashed)
|
||||
})
|
||||
|
||||
// copy the code file to log and end write stream
|
||||
writeStream.end(program)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Promisified child_process.execFile
|
||||
*
|
||||
* @param file - The name or path of the executable file to run.
|
||||
* @param args - List of string arguments.
|
||||
* @param writeStream - Child process stdout and stderr will be piped to it.
|
||||
*
|
||||
* @returns {Promise<{ stdout: string, stderr: string }>}
|
||||
*/
|
||||
const execFilePromise = (
|
||||
file: string,
|
||||
args: string[],
|
||||
writeStream: WriteStream
|
||||
): Promise<{ stdout: string; stderr: string }> => {
|
||||
return new Promise((resolve, reject) => {
|
||||
const child = execFile(file, args, (err, stdout, stderr) => {
|
||||
if (err) reject(err)
|
||||
|
||||
resolve({ stdout, stderr })
|
||||
})
|
||||
|
||||
child.stdout?.on('data', (data) => {
|
||||
writeStream.write(data)
|
||||
})
|
||||
|
||||
child.stderr?.on('data', (data) => {
|
||||
writeStream.write(data)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
|
||||
|
||||
1
api/src/types/system/process.d.ts
vendored
1
api/src/types/system/process.d.ts
vendored
@@ -9,6 +9,7 @@ declare namespace NodeJS {
|
||||
logsLoc: string
|
||||
logsUUID: string
|
||||
sessionController?: import('../../controllers/internal').SessionController
|
||||
sasSessionController?: import('../../controllers/internal').SASSessionController
|
||||
appStreamConfig: import('../').AppStreamConfig
|
||||
logger: import('@sasjs/utils/logger').Logger
|
||||
runTimes: import('../../utils').RunTimeType[]
|
||||
|
||||
644
web/package-lock.json
generated
644
web/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,7 @@ import Box from '@mui/material/Box'
|
||||
|
||||
const Home = () => {
|
||||
return (
|
||||
<Box className="main">
|
||||
<Box className="container">
|
||||
<CssBaseline />
|
||||
<h2>Welcome to SASjs Server!</h2>
|
||||
<p>
|
||||
|
||||
@@ -38,7 +38,7 @@ const Login = () => {
|
||||
|
||||
return (
|
||||
<Box
|
||||
className="main"
|
||||
className="container"
|
||||
component="form"
|
||||
onSubmit={handleSubmit}
|
||||
sx={{
|
||||
|
||||
@@ -69,7 +69,7 @@ const UpdatePassword = () => {
|
||||
/>
|
||||
) : (
|
||||
<Box
|
||||
className="main"
|
||||
className="container"
|
||||
component="form"
|
||||
onSubmit={handleSubmit}
|
||||
sx={{
|
||||
|
||||
@@ -47,7 +47,7 @@ const AuthCode = () => {
|
||||
}
|
||||
|
||||
return (
|
||||
<Box className="main">
|
||||
<Box className="container">
|
||||
<CssBaseline />
|
||||
<br />
|
||||
<h2>Authorization Code</h2>
|
||||
|
||||
@@ -261,8 +261,10 @@ const useEditor = ({
|
||||
axios
|
||||
.get(`/SASjsApi/drive/file?_filePath=${selectedFilePath}`)
|
||||
.then((res: any) => {
|
||||
setPrevFileContent(res.data)
|
||||
setFileContent(res.data)
|
||||
const content =
|
||||
typeof res.data === 'object' ? JSON.stringify(res.data) : res.data
|
||||
setPrevFileContent(content)
|
||||
setFileContent(content)
|
||||
})
|
||||
.catch((err) => {
|
||||
setModalTitle('Abort')
|
||||
|
||||
@@ -12,7 +12,7 @@ code {
|
||||
monospace;
|
||||
}
|
||||
|
||||
.main {
|
||||
.container {
|
||||
margin: 50px 10px 0 10px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
Reference in New Issue
Block a user