dcp-worker 4.4.1 → 4.4.2

package/lib/web-iface.js

@@ -377,7 +377,7 @@ function filenameFromPathname(docroot, pathname, strip)
     pathname = pathname.slice(strip.length);
   }
   const filename = path.join(docroot, pathname);
-  if (!filename.startsWith(docroot) || filename[docroot.length] !== '/')
+  if (!filename.startsWith(docroot) || filename[docroot.length] !== path.sep)
     throw new Error(`invalid pathname ${pathname} ${filename} ${docroot}`);
   return filename;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-worker",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "Node.js Worker for Distributive Compute Platform",
   "main": "bin/dcp-worker",
   "keywords": [

package/www/hud/small-dark.html

@@ -22,6 +22,7 @@
 import * as hud from "./hud-common.mjs";
 window.addEventListener('error',              ev => dcp['dom-tk'].modals.alert(ev));
 window.addEventListener('unhandledrejection', ev => dcp['dom-tk'].modals.alert(ev.reason));
+document.body.style.height = window.innerHeight + 'px';
     </script>
     <style type="text/css">
 HTML, BODY {
@@ -120,14 +121,76 @@ async function init()
     el.textContent = String(bnTotal.plus(bnAmount));
   });
 
-  worker.on('job', job => logger(`New job: ${job.name} ${job.id.slice(0,8)} ${job.description || ''} ${job.link || ''}`));
-  worker.on('sandbox', sandbox => logger('sbox', sandbox));
-  worker.on('connect', (runInfo, taskInfo) => {
-    displayRunInfo(runInfo);
-    logger(`Worker currently has ${Object.keys(taskInfo.jobs).length} jobs loaded`);
+  //
+  // WORKER EVENTS
+  //
+
+  // Fired when fetching work from the scheduler
+  worker.on("fetch", ev => {
+    const jobIds = Object.keys(ev.jobs);
+
+    if (jobIds.length === 0) {
+      logger("[worker.fetch] No new work fetched; retrying in 7 seconds...");
+      return;
+    }
+
+    const sizeKB = (ev.fetchSize / 1024).toFixed(2);
+    logger(`[worker.fetch] fetchSize: ${sizeKB} KB`);
+
+    for (const jobId of jobIds) {
+      const job = ev.jobs[jobId];
+      const sliceCount = ev.slices[jobId] || 0;
+
+      logger(`jobId: ${jobId}\tname: ${job.name}\tdescription: ${job.description}\tlink: ${job.link}\tslicesFetched: ${sliceCount}`)
+    }
+  });
+
+  // Fired after a slice result is sent (or fails to send)
+  worker.on("result", (urlOrError, size, jobId) => {
+    if (urlOrError instanceof Error) {
+      logger(`[worker.result] job ${jobId} had error ${urlOrError.message}`);
+    } else {
+      logger(`[worker.result] job ${jobId} sent ${(size / 1024).toFixed(2)} KB to ${urlOrError || "scheduler"}`);
+    }
   });
-  worker.on('stop', () => logger('Worker is preparing to shut down'));
-  worker.on('end', () => logger('Worker has stopped'));
+
+  // Payment received for completed slices
+  let totalEarned = 0;
+  const totalEarnedEl = document.getElementById("total-earned");
+  worker.on("payment", (payment, paymentAccount, jobId, slice) => {
+    totalEarned += Number(payment);
+    if (totalEarnedEl) {
+      totalEarnedEl.textContent = `${totalEarned.toFixed(3)} ⊇`;
+    }
+    logger(
+      `[worker.payment] ` +
+      `payment: ${payment} ⊇, ` +
+      `depositAccount: ${paymentAccount}, ` +
+      `jobId: ${jobId}, ` +
+      `slice: ${slice}`
+    );
+  });
+
+  // Worker stop requested; shutdown starting
+  worker.on("stop", abort => {
+    logger("[worker.stop] worker preparing to shutdown...");
+  });
+
+  // Worker shutdown complete
+  worker.on("end", () => {
+    logger("[worker.end] worker fully stopped");
+  });
+
+  // Internal error occurred in worker
+  worker.on("error", err => {
+    logger(`[worker.error] ${error.code ? error.message+'; code='+error.code : error.message}`);
+  });
+
+  // Warning occurred in worker
+  worker.on("warning", warn => {
+    logger(`[worker.warning] ${JSON.stringify(warn, null, 2)}`);
+  });
+
 }
 
 const logLines = [];
@@ -135,7 +198,8 @@ const logSize = 100;
 function logger(...args)
 {
   const logEl = $('#loggerText');
-  const msg = args.map(arg => String(arg)).join(' ');
+  const ts = new Date().toLocaleTimeString();
+  const msg = `[${ts}] ` + args.map(arg => String(arg)).join(' ');
   logLines.push(msg);
   if (logLines.length === logSize)
     logLines.shift();