Use pure child_process.exec instead of execa

Author: 64json

package-lock.json

@@ -30,7 +30,6 @@
     "compression": "^1.7.3",
     "dotenv": "^8.0.0",
     "dotenv-flow": "^2.0.0",
-    "execa": "^1.0.0",
     "express": "^4.16.4",
     "express-github-webhook": "^1.0.6",
     "fs-extra": "^6.0.1",

package.json

@@ -8,10 +8,9 @@ import { __PROD__, credentials, httpPort, httpsPort, webhookOptions } from 'conf
 import http from 'http';
 import https from 'https';
 import { Hierarchy } from 'models';
-import execa from 'execa';
 import * as Tracers from 'tracers';
 import { errorHandlerMiddleware, frontendMiddleware, redirectMiddleware } from 'middlewares';
-import { pull } from 'utils/misc';
+import { execute, pull } from 'utils/misc';
 import { frontendBuildDir, frontendBuiltDir, frontendDir, rootDir } from 'config/paths';
 
 const Webhook = require('express-github-webhook');
@@ -76,13 +75,13 @@ export default class Server {
 
   async update(commit?: string) {
     await pull(rootDir, 'server', commit);
-    await execa.shell('npm install', {cwd: rootDir});
+    await execute('npm install', {cwd: rootDir});
     process.exit(0);
   };
 
   async updateFrontend(commit?: string) {
     await pull(frontendDir, 'algorithm-visualizer', commit);
-    await execa.shell([
+    await execute([
       'npm install',
       'npm run build',
       `rm -rf ${frontendBuiltDir}`,

src/Server.ts

@@ -4,8 +4,7 @@ import { GitHubApi } from 'utils/apis';
 import { Algorithm, Category, File } from 'models';
 import { Author } from 'models/File';
 import { algorithmsDir } from 'config/paths';
-import { pull } from 'utils/misc';
-import execa from 'execa';
+import { execute, pull } from 'utils/misc';
 
 type CommitAuthors = {
   [sha: string]: Author,
@@ -52,7 +51,7 @@ export class Hierarchy {
 
   async cacheContributors(files: File[], commitAuthors: CommitAuthors) {
     for (const file of files) {
-      const stdout = await execa('git', ['--no-pager', 'log', '--follow', '--no-merges', '--format="%H"', '--', `"${file.path}"`], {
+      const stdout = await execute(`git --no-pager log --follow --no-merges --format="%H" -- "${path.relative(this.path, file.path)}"`, {
         cwd: this.path,
       });
       const output = stdout.toString().replace(/\n$/, '');

src/models/Hierarchy.ts

@@ -5,7 +5,7 @@ import uuid from 'uuid';
 import fs from 'fs-extra';
 import { memoryLimit, timeLimit } from 'config/constants';
 import { codesDir } from 'config/paths';
-import execa = require('execa');
+import { execute } from 'utils/misc';
 
 export class DockerTracer extends Tracer {
   private readonly directory: string;
@@ -21,7 +21,7 @@ export class DockerTracer extends Tracer {
 
   build(release: Release) {
     const {tag_name} = release;
-    return execa('docker', ['build', '-t', this.imageName, '.', '--build-arg', `tag_name=${tag_name}`], {cwd: this.directory});
+    return execute(`docker build -t ${this.imageName} . --build-arg tag_name=${tag_name}`, {cwd: this.directory});
   }
 
   route(router: express.Router) {
@@ -33,19 +33,19 @@ export class DockerTracer extends Tracer {
           const containerName = uuid.v4();
           let killed = false;
           const timer = setTimeout(() => {
-            execa('docker', ['kill', containerName]).then(() => {
+            execute(`docker kill ${containerName}`).then(() => {
               killed = true;
             });
           }, timeLimit);
-          return execa('docker', [
-            'run', '--rm',
+          return execute([
+            'docker run --rm',
             `--name=${containerName}`,
             '-w=/usr/visualization',
             `-v=${tempPath}:/usr/visualization:rw`,
             `-m=${memoryLimit}m`,
-            '-e', 'ALGORITHM_VISUALIZER=1',
+            '-e ALGORITHM_VISUALIZER=1',
             this.imageName,
-          ]).catch(error => {
+          ].join(' ')).catch(error => {
             if (killed) throw new Error('Time Limit Exceeded');
             throw error;
           }).finally(() => clearTimeout(timer));

src/tracers/DockerTracer.ts

@@ -1,8 +1,9 @@
 import axios from 'axios';
 import fs from 'fs-extra';
-import execa from 'execa';
 import { File } from 'models';
 import removeMarkdown from 'remove-markdown';
+import * as child_process from 'child_process';
+import { ExecOptions } from 'child_process';
 
 export function download(url: string, localPath: string) {
   return axios({url, method: 'GET', responseType: 'stream'})
@@ -16,11 +17,11 @@ export function download(url: string, localPath: string) {
 
 export async function pull(dir: string, repo: string, commit = 'origin/master') {
   if (fs.pathExistsSync(dir)) {
-    await execa.shell(`git fetch`, {cwd: dir});
+    await execute(`git fetch`, {cwd: dir});
   } else {
-    await execa.shell(`git clone https://github.com/algorithm-visualizer/${repo}.git ${dir}`);
+    await execute(`git clone https://github.com/algorithm-visualizer/${repo}.git ${dir}`);
   }
-  await execa.shell(`git reset --hard ${commit}`, {cwd: dir});
+  await execute(`git reset --hard ${commit}`, {cwd: dir});
 }
 
 export function getDescription(files: File[]) {
@@ -34,6 +35,18 @@ export function getDescription(files: File[]) {
   return removeMarkdown(descriptionLines.join(' '));
 }
 
-export function rethrow(err: any) {
-  throw err;
+type ExecuteOptions = ExecOptions & {
+  stdout?: NodeJS.WriteStream;
+  stderr?: NodeJS.WriteStream;
+}
+
+export function execute(command: string, {stdout, stderr, ...options}: ExecuteOptions = {}): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const child = child_process.exec(command, options, (error, stdout, stderr) => {
+      if (error) return reject(error.code ? new Error(stderr) : error);
+      resolve(stdout);
+    });
+    if (child.stdout && stdout) child.stdout.pipe(stdout);
+    if (child.stderr && stderr) child.stderr.pipe(stderr);
+  });
 }

src/utils/misc.ts

@@ -18,5 +18,6 @@
   },
   "exclude": [
     "node_modules",
+    "public"
   ]
 }