Mascali/piston
1
0
Fork 0
mirror of https://github.com/engineer-man/piston.git synced 2025-06-09 03:26:27 +02:00
Code Issues Projects Releases Wiki Activity

Continue implementation for uploading binary files

Browse source
This commit is contained in:
Brikaa 2021-10-14 21:14:10 +02:00
parent 0faea205db
commit 0a2dae82e8
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/src/api/v2.js
View file

@ -86,6 +86,14 @@ function get_job(body) {
}); });
} }
} }
if (
files.filter(file => !file.encoding || file.encoding === 'utf8')
.length === 0
) {
return reject({
message: 'files must include at least one utf8 encoded file',
});
}
const rt = runtime.get_latest_runtime_matching_language_version( const rt = runtime.get_latest_runtime_matching_language_version(
language, language,

16
api/src/job.js
View file

@ -37,6 +37,7 @@ class Job {
? file.encoding ? file.encoding
: 'utf8', : 'utf8',
})); }));
this.code_files = this.files.filter(file => file.encoding === 'utf8');
this.args = args; this.args = args;
this.stdin = stdin; this.stdin = stdin;
@ -81,7 +82,6 @@ class Job {
for (const file of this.files) { for (const file of this.files) {
const file_path = path.join(this.dir, file.name); const file_path = path.join(this.dir, file.name);
const rel = path.relative(this.dir, file_path); const rel = path.relative(this.dir, file_path);
const file_content = Buffer.from(file.content, file.encoding);
if (rel.startsWith('..')) if (rel.startsWith('..'))
throw Error( throw Error(
@ -94,7 +94,7 @@ class Job {
}); });
await fs.chown(path.dirname(file_path), this.uid, this.gid); await fs.chown(path.dirname(file_path), this.uid, this.gid);
await fs.write_file(file_path, file_content); await fs.write_file(file_path, file.content, file.encoding);
await fs.chown(file_path, this.uid, this.gid); await fs.chown(file_path, this.uid, this.gid);
} }
@ -222,8 +222,6 @@ class Job {
} runtime=${this.runtime.toString()}` } runtime=${this.runtime.toString()}`
); );
const code_files = this.files.filter(file => file.encoding == 'utf8');
logger.debug('Compiling'); logger.debug('Compiling');
let compile; let compile;
@ -231,7 +229,7 @@ class Job {
if (this.runtime.compiled) { if (this.runtime.compiled) {
compile = await this.safe_call( compile = await this.safe_call(
path.join(this.runtime.pkgdir, 'compile'), path.join(this.runtime.pkgdir, 'compile'),
code_files.map(x => x.name), this.code_files.map(x => x.name),
this.timeouts.compile, this.timeouts.compile,
this.memory_limits.compile this.memory_limits.compile
); );
@ -241,7 +239,7 @@ class Job {
const run = await this.safe_call( const run = await this.safe_call(
path.join(this.runtime.pkgdir, 'run'), path.join(this.runtime.pkgdir, 'run'),
[code_files[0].name, ...this.args], [this.code_files[0].name, ...this.args],
this.timeouts.run, this.timeouts.run,
this.memory_limits.run this.memory_limits.run
); );
@ -270,13 +268,11 @@ class Job {
} gid=${this.gid} runtime=${this.runtime.toString()}` } gid=${this.gid} runtime=${this.runtime.toString()}`
); );
const code_files = this.files.filter(file => file.encoding == 'utf8');
if (this.runtime.compiled) { if (this.runtime.compiled) {
eventBus.emit('stage', 'compile'); eventBus.emit('stage', 'compile');
const { error, code, signal } = await this.safe_call( const { error, code, signal } = await this.safe_call(
path.join(this.runtime.pkgdir, 'compile'), path.join(this.runtime.pkgdir, 'compile'),
code_files.map(x => x.name), this.code_files.map(x => x.name),
this.timeouts.compile, this.timeouts.compile,
this.memory_limits.compile, this.memory_limits.compile,
eventBus eventBus
@ -289,7 +285,7 @@ class Job {
eventBus.emit('stage', 'run'); eventBus.emit('stage', 'run');
const { error, code, signal } = await this.safe_call( const { error, code, signal } = await this.safe_call(
path.join(this.runtime.pkgdir, 'run'), path.join(this.runtime.pkgdir, 'run'),
[code_files[0].name, ...this.args], [this.code_files[0].name, ...this.args],
this.timeouts.run, this.timeouts.run,
this.memory_limits.run, this.memory_limits.run,
eventBus eventBus