npm - dcp-worker - Versions diffs - 4.3.7 → 4.4.0 - Mend

dcp-worker 4.3.7 → 4.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/bin/dcp-evaluator-manager +15 -1
package/bin/dcp-evaluator-start +9 -2
package/bin/dcp-worker +197 -101
package/lib/default-ui-events.js +3 -3
package/lib/pidfile.js +7 -3
package/lib/show.js +7 -16
package/lib/telnetd.js +1 -1
package/lib/utils.js +219 -9
package/lib/web-iface.js +495 -91
package/lib/worker-consoles/dashboard-console.js +8 -1
package/lib/worker-consoles/stdio-console.js +9 -2
package/package.json +6 -5
package/www/admin/index.html +22 -0
package/www/admin/manage-worker.html +19 -0
package/www/admin/register-worker.html +334 -0
package/www/hud/dark.css +10 -0
package/www/hud/hud-common.css +19 -0
package/www/hud/hud-common.mjs +69 -0
package/www/hud/index.html +46 -0
package/www/hud/small-dark.html +346 -0
package/lib/web-console.js +0 -178

package/www/hud/small-dark.html ADDED Viewed

@@ -0,0 +1,346 @@
+<!doctype html>
+<!--
+ - @file    small-dark.html - small, dark status screen for the worker
+ - @author  Wes Garland, wes@distributive.network
+ - @date    Feb 2026
+ -
+ - DCP logo is hidden by default; use ?show-logo to reveal
+ -
+-->
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <title>DCP Worker - HUD</title>
+    <link rel="stylesheet" type="text/css" href="./hud-common.css">
+    <script src="/etc/dcp-config.js"></script>
+    <script src="/dcp-client/dcp-client.js"></script>
+    <link rel="stylesheet" type="text/css" dcp-cdn-href="/css/dcp-style.css">
+    <link rel="stylesheet" type="text/css" href="./dark.css">
+    <script cdn-src="/dom-tk.js?dcp-worker-version=4.3.7"></script>
+    <script type="module">
+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));
+    </script>
+    <style type="text/css">
+HTML, BODY {
+  height:     100%;
+  width:      100%;
+  min-height: 100%; /* opera */
+  margin:     0;
+  padding:    0;
+  overflow:   hidden;
+}
+DIV#dcp-logo {
+  background-image:    url(/dcp-client/assets/dcp-logo.png);
+  background-position: center;
+  background-repeat:   no-repeat;
+  background-size:     contain;
+  height:              20vh;
+  max-height:          60px;
+  margin-top:          1em;
+}
+BODY[show-logo="false"] DIV#dcp-logo-header {
+  display: none;
+}
+#logBlocker {
+  width: 100%;
+  background-color: black;
+  position:         relative;
+  z-index:          1;
+}
+#loggerText {
+  white-space:   pre-wrap;
+  position:      absolute;
+  bottom:        0;
+  max-height:    100%;
+  width:         100%;
+  overflow-x:    hidden;
+  overflow-y:    scroll;
+  text-overflow: ellipsis;
+  text-wrap:     nowrap;
+  padding:       5px;
+}
+TABLE
+{
+  align: left;
+  width: 100%;
+  border-bottom: 1px dotted #ccc;
+}
+TD {
+  min-width:     20ch;
+  overflow:      hidden;
+  text-overflow: ellipsis;
+}
+TH {
+  text-align: left;
+  text-wrap: nowrap;
+}
+    </style>
+    <script src="/worker/run-info"></script>
+    <script>
+'use strict';
+if (!runInfo)
+  setTimeout(() => window.location.reload(), 1500);
+    </script>
+    <script>
+'use strict';
+const $ = document.querySelector.bind(document);
+const $$ = document.querySelectorAll.bind(document);
+function displayRunInfo(newRunInfo)
+{
+  if (newRunInfo)
+    Object.assign(runInfo, newRunInfo);
+  runInfo.startTime = new Date(runInfo.startTime).toLocaleString();
+  runInfo.totalEarnings = new dcp.types.BigNumber(runInfo.totalEarnings.toFixed(3));
+  $$('[run-info]').forEach(element => {
+    const prop = element.getAttribute('run-info');
+    element.textContent = String(runInfo[prop]);
+  });
+}
+async function init()
+{
+  displayRunInfo();
+  const worker = new DistributiveWorkerLink(window.location.origin);
+  worker.on('payment', (amount) => {
+    const el = $('[run-info="totalEarnings"]');
+    const bnTotal = new dcp.types.BigNumber(el.textContent);
+    const bnAmount = new dcp.types.BigNumber(amount);
+    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.on('stop', () => logger('Worker is preparing to shut down'));
+  worker.on('end', () => logger('Worker has stopped'));
+}
+const logLines = [];
+const logSize = 100;
+function logger(...args)
+{
+  const logEl = $('#loggerText');
+  const msg = args.map(arg => String(arg)).join(' ');
+  logLines.push(msg);
+  if (logLines.length === logSize)
+    logLines.shift();
+  logEl.textContent = logLines.join('\n');
+  logEl.scrollTo({top: logEl.scrollHeight, behavior: 'smooth'});
+}
+class DistributiveWorkerLinkEvent
+{
+  #cancelled = false;
+  #args;
+  constructor(args)
+  {
+    this.#args = args || [];
+  }
+  preventDefault()
+  {
+  }
+  stopPropagation()
+  {
+    this.#cancelled = true;
+  }
+  dispatch(callback)
+  {
+    var wev;
+    if (globalThis.window === globalThis)
+    {
+      wev = window.event;
+      window.event = this;
+    }
+    callback(...this.#args);
+    if (globalThis.window === globalThis)
+      window.event = wev;
+    return !this.#cancelled;
+  }
+}
+class DistributiveWorkerLink
+{
+  #connectType = 'normal';
+  #location;
+  static #KVIN = (() => {
+    const KVIN = new dcp.kvin.KVIN();
+    KVIN.userCtors.BigNumber = dcp.types.BigNumber;
+    KVIN.userCtors.JobHandle = Object;
+    KVIN.userCtors.SanboxHandle = Object;
+    return KVIN;
+  })(/*iife*/);
+  constructor(location)
+  {
+    this.events = {};
+    this.#location = new URL(origin + '/dcp/');
+    this.#connect();
+  }
+  #connect()
+  {
+    var reqs = [];
+    var queue = []; /* queue up notifications that arrive during Promise.allSettled */
+    this.conn = new dcp.protocol.Connection({ location: this.#location });
+    this.conn.on('end', (ev) => {
+      if (this.conn.closeErrorCode === 'ECONNRESET') /* Worker went down and came back up */
+        window.location.reload();
+    });
+    this.conn.on('connect', async () => {
+      var taskInfo, runInfo;
+      const p$res = [
+        this.conn.request('task-info').then(res => taskInfo = res.payload),
+        this.conn.request('run-info') .then(res => runInfo  = res.payload)
+      ];
+      try
+      {
+        await Promise.all(p$res);
+        this.#dispatchEvent('connect', [ runInfo, taskInfo ]);
+        this.#connectType = 'normal';
+      }
+      catch(error)
+      {
+        if (error.code === 'EADDRCHANGE')
+          this.#connectType = 'never';
+        else
+          this.#connectType = 'slow';
+        throw error;
+      }
+    });
+    this.conn.on('end', async () => {
+      switch(this.#connectType)
+      {
+        case 'never':
+          console.log('ignore connect request, reload document to reconnect');
+          return;
+        case 'slow':
+          await dcp.utils.a$sleep(10);
+          /* fallthrough */
+        case 'normal':
+          break;
+      }
+      this.#connect();
+    });
+    this.conn.on('notification', notification => {
+      if (reqs.length === 0)
+        this.#processNotification(notification);
+      else
+        queue.push(notification);
+    });
+    for (let eventName of Object.keys(this.events))
+      reqs.push(this.conn.request('event-on', eventName));
+    Promise.allSettled(reqs).then(async () => {
+      for (let eventName of Object.keys(this.events))
+        this.events[eventName].eventHandlerId = await reqs.shift();
+      for (let notification of queue)
+        this.#processNotification(notification);
+    });
+  }
+  #dispatchEvent(eventName, args)
+  {
+    if (!this.events[eventName])
+      return;
+    for (let event of this.events[eventName])
+    {
+      const ev = new DistributiveWorkerLinkEvent(args)
+      if (ev.dispatch(event.eventHandler) === false)
+        break;
+    }
+  }
+  #processNotification(notification)
+  {
+    if (notification.payload.data.type !== 'event')
+      throw new Error('invalid notification type: ' + notification.payload.data.type);
+    const eventName = notification.payload.data.name;
+    this.#dispatchEvent(eventName, this.constructor.#KVIN.parse(notification.payload.data.kvinArgs));
+  }
+  async on(eventName, eventHandler)
+  {
+    var eventHandlerId;
+    if (!this.events[eventName])
+      this.events[eventName] = [];
+    if (eventName === 'connect') /* internal event */
+      eventHandlerId = Math.random().toFixed(36) + Date.now();
+    else
+    {
+      try
+      {
+        const res = await this.conn.request('event-on', eventName);
+        eventHandlerId = res.payload.eventHandlerId;
+      }
+      catch(error)
+      {
+        if (error.code === 'EPIPE')
+          this.on(eventName, eventHandler); /* try again on new connection */
+        else
+          throw error;
+      }
+    }
+    this.events[eventName].push({ eventHandler, eventHandlerId });
+  }
+  off(eventName, eventHandler)
+  {
+    for (let i=0; i < this.events[eventName].length; i++)
+    {
+      event = this.events[eventName][i];
+      if (event.eventHandler === eventHandler)
+      {
+        conn.request('event-off', { eventName, eventHandlerId: event.eventHandlerId });
+        this.events[eventName].splice(i, 1);
+        break;
+      }
+    }
+  }
+  addEventListener = this.on;
+  removeEventListener = this.off;
+}
+    </script>
+  </head>
+  <body onload="init();" show-logo="false">
+    <div id="logBlocker">
+      <div id="dcp-logo-header">
+        <div id="dcp-logo"></div>
+        <center><h3>DCP Worker</h3></center>
+      </div>
+      <table>
+        <tr><th>Running Since:</th>        <td run-info="startTime"></td></tr>
+        <tr><th>Earnings Since Start:</th> <td run-info="totalEarnings"   class="dcp-amount"></td></tr>
+        <tr><th>Earnings Account:</th>     <td run-info="earningsAccount" class="dcp-fixed-font"></td></tr>
+      </table>
+    </div>
+    <div id="loggerText" class="dcp-fixed-font">connecting to worker...</div>
+  </body>
+  <script>
+'use strict';
+{
+  const searchParams = new URL(window.location.href).searchParams;
+  if (searchParams.has('show-logo'))
+    document.body.setAttribute('show-logo', searchParams.get('show-logo') || 'true');
+}
+  </script>
+</html>

package/lib/web-console.js DELETED Viewed

@@ -1,178 +0,0 @@
-/**
- * https://stackoverflow.com/questions/52843900/blessed-server-node-js-over-websocket-to-xterm-js-client-in-browser
- */
-const blessed = require('blessed');
-const contrib = require('blessed-contrib');
-const path    = require('path');
-const fs      = require('fs');
-const http    = require('http');
-const progDir = path.dirname(require.main.filename);
-const wwwDir  = path.resolve(progDir, '../www');
-const nmDir   = path.resolve(progDir, '../node_modules');
-const magic = {
-  html: 'text/html',
-  txt:  'text/plain',
-  js:   'application/javascript',
-  css:  'text/css',
-  gif:  'image/gif',
-  jpeg: 'image/jpeg',
-  jpg:  'image/jpeg',
-  png:  'image/png',
-  svg:  'image/svg+xml',
-  kvin: 'application/x-kvin',
-}
-const clients = [ ];
-var worker; /* instance of DistributiveWorker, null (stopped), or undefined (not started) */
-/**
- * Return a copy of the local dcp config, with the current worker's config at dcpConfig.worker, but with
- * with sensitive information (eg compute group credentials) stripped.
- */
-function makeSafeConfig()
-{
-  const conf = Object.assign({}, dcpConfig);
-  conf.worker = Object.assign({}, worker.config || dcpConfig.worker?.config);
-  /* Sanitize worker.computeGroups credentials */
-  if (conf.worker?.computeGroups)
-  {
-    conf.worker.computeGroups = Object.assign({}, conf.worker.computeGroups);
-    for (let key in conf.worker.computeGroups)
-    {
-      const group = conf.worker.computeGroups[key];
-      if (group.joinKey)
-        group = { joinKey: group.joinKey };
-      else
-        group = {};
-      conf.worker.computeGroups[key] = group;
-    }
-  }
-  return conf;
-}
-/**
- * HTTP server
- */
-function handleHttpRequest(request, response)
-{
-  if (request.url === '/etc/dcp-config.js')
-  {
-    response.setHeader('Content-Type', magic.js);
-    response.end(makeSkeletonConfig());
-    return;
-  }
-  if (request.url === '/etc/dcp-config.kvin')
-  {
-    response.setHeader('Content-Type', magic.kvin);
-    response.end('(' + JSON.stringify(dcpConfig) + ')');
-    return;
-  }
-  var filename = (request.url.slice(1) || 'index.html');
-  const contentType = magic[path.extname(filename).slice(1)] || 'text/plain';
-  var errorStatus, contentDir;
-  if (!filename.startsWith('node_modules/'))
-    contentDir = wwwDir;
-  else
-  {
-    contentDir = nmDir;
-    filename = filename.slice(13);
-  }
-  filename = path.resolve(contentDir, filename);
-  console.log({contentDir,filename,requestUrl:request.url});
-  if (!filename.startsWith(contentDir) || filename[0] !== '/')
-    errorStatus = 401;
-  else if (!fs.existsSync(filename))
-    errorStatus = 404;
-  if (errorStatus)
-  {
-    response.setHeader('Content-Type', 'text/plain');
-    response.statusCode = errorStatus;
-    response.end(`${errorStatus} accessing ${filename}`);
-    return;
-  }
-  response.setHeader('Content-Type', contentType);
-  response.end(fs.readFileSync(filename));
-}
-exports.getConfig = function webConsole$$getConfig()
-{
-  var config = { host: 'localhost', port: 9080 };
-  if (dcpConfig.worker?.webConsole?.listen)
-  {
-    config.host = dcpConfig.worker.webConsole.listen.host;
-    config.port = dcpConfig.worker.webConsole.listen.port || 80;
-  }
-  return config;
-}
-exports.a$init = function webConsole$$init()
-{
-  var server = http.createServer(handleHttpRequest).unref();
-  var resolve, reject;
-  var a$Promise = new Promise((_resolve, _reject) => {
-    resolve = _resolve;
-    reject = _reject;
-  });
-  server.on('error', error => {
-    console.error(` ! Web console not started; ${error.message}`);
-    reject(error);
-  });
-  server.listen(exports.getConfig(), function webConsole$$ready() {
-    resolve();
-    console.log(` * httpd listening on ${server._connectionKey}`);
-  });
-  /**
-   * WebSocket server
-   */
-  const WebSocketServer = require('websocket').server;
-  const wsServer = new WebSocketServer({
-    httpServer: server,
-    autoAcceptConnections: false
-  });
-  wsServer.on('request', handleWssRequest);
-  function handleWssRequest(request)
-  {
-    const connection = request.accept(null, request.origin);
-    connection.socket.unref();
-    clients.push(connection);
-    const write = connection.send;
-    const read = connection.socket.read;
-    connection.send(JSON.stringify({ type: 'log', facility: 'debug', message: 'hello, world' }));
-    connection.on('message', messageHandler);
-    connection.on('close', closeHandler);
-    function messageHandler(message)
-    {
-      console.log('message:', message)
-      console.log('this:', this);
-    }
-    function closeHandler()
-    {
-    }
-  }
-  return a$Promise;
-}
-exports.setWorker = function webConsole$$setWorker(dw)
-{
-  worker = dw;
-}