1
0
mirror of https://github.com/sasjs/server.git synced 2025-12-11 03:34:35 +00:00

fix: recreate crashed session

This commit is contained in:
Saad Jutt
2022-01-06 23:12:44 +05:00
parent cd838915fd
commit 6cbc657da3
2 changed files with 19 additions and 7 deletions

View File

@@ -15,7 +15,7 @@ const app = express()
const { MODE, CORS, PORT_WEB } = process.env
const whiteList = [
`http://localhost:${PORT_WEB ?? 3000}`,
'https://sas.analytium.co.uk:8343/'
'https://sas.analytium.co.uk:8343'
]
if (MODE?.trim() !== 'server' || CORS?.trim() === 'enable') {

View File

@@ -12,7 +12,8 @@ import {
createFile,
fileExists,
generateTimestamp,
readFile
readFile,
moveFile
} from '@sasjs/utils'
const execFilePromise = promisify(execFile)
@@ -32,8 +33,9 @@ export class SessionController {
return session
}
private async createSession() {
private async createSession(): Promise<Session> {
const sessionId = generateUniqueFileName(generateTimestamp())
console.log('creating session', sessionId)
const sessionFolder = path.join(getTmpSessionsFolderPath(), sessionId)
const creationTimeStamp = sessionId.split('-').pop() as string
@@ -100,25 +102,35 @@ export class SessionController {
// SAS has been triggered but we can't use it until
// the autoexec deletes the code.sas file
await this.waitForSession(session)
if (!(await this.waitForSession(session))) {
console.log('session is crashed', sessionId)
return this.createSession()
}
console.log('session is ready', sessionId)
return session
}
public async waitForSession(session: Session) {
private async waitForSession(session: Session) {
const codeFilePath = path.join(session.path, 'code.sas')
// TODO: don't wait forever
while ((await fileExists(codeFilePath)) && !session.crashed) {}
console.log('session crashed?', !!session.crashed, session.crashed || '')
if (session.crashed) {
await this.deleteSession(session)
return false
}
session.ready = true
return Promise.resolve(session)
return true
}
public async deleteSession(session: Session) {
// remove the temporary files, to avoid buildup
await deleteFolder(session.path)
if (session.crashed) await moveFile(session.path, `${session.path}-crashed`)
else await deleteFolder(session.path)
// remove the session from the session array
if (session.ready) {