mirror of
https://github.com/sasjs/server.git
synced 2025-12-11 19:44:35 +00:00
fix: execute child process asyncronously
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
import path from 'path'
|
import path from 'path'
|
||||||
import fs from 'fs'
|
import { WriteStream, createWriteStream } from 'fs'
|
||||||
import { execFileSync } from 'child_process'
|
import { execFile } from 'child_process'
|
||||||
import { once } from 'stream'
|
import { once } from 'stream'
|
||||||
import { createFile, moveFile } from '@sasjs/utils'
|
import { createFile, moveFile } from '@sasjs/utils'
|
||||||
import { PreProgramVars, Session } from '../../types'
|
import { PreProgramVars, Session } from '../../types'
|
||||||
@@ -105,26 +105,58 @@ export const processProgram = async (
|
|||||||
throw new Error('Invalid runtime!')
|
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
|
// create a stream that will write to console outputs to log file
|
||||||
const writeStream = fs.createWriteStream(logPath)
|
const writeStream = createWriteStream(logPath)
|
||||||
// waiting for the open event so that we can have underlying file descriptor
|
// waiting for the open event so that we can have underlying file descriptor
|
||||||
await once(writeStream, 'open')
|
await once(writeStream, 'open')
|
||||||
execFileSync(executablePath, [codePath], {
|
|
||||||
stdio: ['ignore', writeStream, writeStream]
|
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
|
.catch((err) => {
|
||||||
writeStream.end(program)
|
session.completed = true
|
||||||
session.completed = true
|
session.crashed = err.toString()
|
||||||
process.logger.info('session completed', session)
|
process.logger.error('session crashed', session.id, session.crashed)
|
||||||
} catch (err: any) {
|
})
|
||||||
session.completed = true
|
|
||||||
session.crashed = err.toString()
|
// copy the code file to log and end write stream
|
||||||
process.logger.error('session crashed', session.id, session.crashed)
|
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))
|
const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
|
||||||
|
|||||||
Reference in New Issue
Block a user