@miso.ai/server-jobs 0.6.6-beta.0 → 0.6.6-beta.10

package/package.json

@@ -16,7 +16,7 @@
     "simonpai <simon.pai@askmiso.com>"
   ],
   "dependencies": {
-    "@miso.ai/server-commons": "0.6.6-beta.0"
+    "@miso.ai/server-commons": "0.6.6-beta.10"
   },
-  "version": "0.6.6-beta.0"
+  "version": "0.6.6-beta.10"
 }

package/src/index.js

@@ -1 +1,2 @@
 export * from './tasks.js';
+export * from './process.js';

package/src/logs.js

@@ -1,6 +1,6 @@
 import { LOG_LEVEL, getLogLevelValue } from './constants.js';
 
-export function generateJobId() {
+export function generateShortId() {
   // 4-char random string
   return Math.random().toString(36).slice(2, 6).toLowerCase();
 }
@@ -64,23 +64,20 @@ function formatEvent({ job, task, type, level, message = '', ...event } = {}) {
 
 function formatJobTag(job) {
   if (typeof job === 'string') {
-    return `[${job}]`;
-  }
-  let tags = '';
-  if (job.id) {
-    tags += `[${job.id}]`;
+    return `[job=${job}]`;
   }
+  const terms = [];
   if (job.name) {
-    tags += `[${job.name}]`;
+    terms.push(job.name);
   }
-  return tags;
+  if (job.id) {
+    terms.push(job.id);
+  }
+  return terms.length ? `[job=${terms.join('/')}]` : '';
 }
 
 function formatTaskTag(task) {
-  if (typeof task === 'string') {
-    return `[${task}]`;
-  }
-  return `[${task.name || task.id}]`;
+  return `[task=${typeof task === 'string' ? task : (task.name || task.id)}]`;
 }
 
 function defaultLogOutput(level, message) {

package/src/process.js

@@ -23,3 +23,33 @@ export async function spawn(command, args, { onStdout, onStderr, ...options } =
     });
   });
 }
+
+export function getMemoryUsage(child) {
+  const ps = spawn('ps', ['-o', 'pid,rss,vsz,pmem', '-p', child.pid]);
+  for await (const line of ps.stdout) {
+    const [pid, rss, vsz, pmem] = line.toString().trim().split(' ');
+    if (pid === child.pid) {
+      return { rss, vsz, pmem };
+    }
+  }
+  return undefined;
+}
+
+export async function finished(child) {
+  return new Promise((resolve, reject) => {
+    // fatal errors, like ENOENT, EACCES
+    child.on('error', reject);
+
+    child.on('close', (code, signal) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error(`Command "${child.spawnargs.join(' ')}" failed with code ${code} and signal ${signal}`));
+      }
+    });
+  });
+}
+
+export function handleEpipe() {
+  process.stdout.on('error', err => err.code == 'EPIPE' && process.exit(0));
+}

package/src/tasks.js

@@ -1,6 +1,7 @@
+import { spawn } from 'child_process';
 import { LOG_LEVEL } from './constants.js';
-import { spawn } from './process.js';
-import { createLogFunction, generateJobId } from './logs.js';
+import { finished } from './process.js';
+import { createLogFunction, generateShortId } from './logs.js';
 import { formatDuration } from './utils.js';
 
 export async function runJob(job, options = {}) {
@@ -10,9 +11,10 @@ export async function runJob(job, options = {}) {
 
   log(`Starting job with ${tasks.length} tasks`);
 
+  const total = tasks.length;
   let index = 0;
   for (let task of tasks) {
-    task = normalizeTask(task, index);
+    task = normalizeTask(task, { index, total });
     await runTask(job, task, options);
     index++;
   }
@@ -27,12 +29,10 @@ async function runTask(job, task, options = {}) {
   const { command, args, shell } = task;
   log(`Starting task: ${formatTaskCommand(task)}`);
 
-  await spawn(command, args || [], {
-    shell,
-    onStdout: data => log(parseJsonIfNecessary(data)),
-    onStderr: data => log(LOG_LEVEL.ERROR.NAME, parseJsonIfNecessary(data)),
-    ...options,
-  });
+  const child = spawn(command, args, { shell });
+  child.stdout.on('data', data => log(parseJsonIfNecessary(data)));
+  child.stderr.on('data', data => log(LOG_LEVEL.ERROR.NAME, parseJsonIfNecessary(data)));
+  await finished(child);
 
   const endTime = Date.now();
   const elapsed = endTime - task.timestamp;
@@ -42,15 +42,15 @@ async function runTask(job, task, options = {}) {
 function normalizeJob(job) {
   job = { ...job, timestamp: Date.now() };
   if (!job.id) {
-    job.id = generateJobId();
+    job.id = generateShortId();
   }
   return job;
 }
 
-function normalizeTask(task, index) {
-  task = { ...task, index, timestamp: Date.now() };
+function normalizeTask(task, { index, total } = {}) {
+  task = { ...task, index, total, timestamp: Date.now() };
   if (!task.id) {
-    task.id = generateJobId();
+    task.id = generateShortId();
   }
   return task;
 }

package/src/version.js

@@ -1 +1 @@
-export default '0.6.6-beta.0';
+export default '0.6.6-beta.10';