@yz-social/civildefense.io 4.5.9 → 4.5.21

package/server/app.js

@@ -1,11 +1,7 @@
 #!/usr/bin/env node
 import process from 'node:process';
-import { exec } from 'node:child_process';
 import {cpus, availableParallelism } from 'node:os';
 import cluster from 'node:cluster';
-import http from 'node:http';
-import express from 'express';
-import logger from 'morgan';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import { resolve } from './dirname.js';
@@ -18,12 +14,12 @@ const argv = yargs(hideBin(process.argv))
       .option('nPortals', {
 	alias: 'p',
 	type: 'number',
-	default: Math.min(logicalCores, 5),
+	default: Math.max(2, logicalCores - 3),
 	description: "The number of steady nodes that handle initial connections."
       })
       .option('baseURL', {
 	type: 'string',
-	default: 'http://localhost:3000/kdht',
+	default: 'http://localhost:3000',
 	description: "The base URL of the portal server through which to bootstrap."
       })
       .option('externalBaseURL', {
@@ -36,15 +32,10 @@ const argv = yargs(hideBin(process.argv))
 	default: false,
 	description: "Announce our availability on the DHT, so that other nodes can enter through us if their original portal goes down."
       })
-      .option('fixedSpacing', {
+      .option('spacing', {
 	type: 'number',
-	default: 2,
-	description: "Minimum seconds to add between each portal."
-      })
-      .options('variableSpacing', {
-	type: 'number',
-	default: 5,
-	description: "Additional variable seconds (+/- variableSpacing/2) to add to fixedSpacing between each portal."
+	default: 3,
+	description: "Minimum seconds to add between each portal on startup and shutdown."
       })
       .option('info', {
 	alias: 'i',
@@ -60,11 +51,22 @@ const argv = yargs(hideBin(process.argv))
       })
       .parse();
 
+const log = argv.info && ((...rest) => console.log(new Date(), ...rest));
+const debug = argv.verbose && ((...rest) => console.log(new Date(), ...rest));
+function delay(ms = argv.spacing * 1e3) { return new Promise(resolve => setTimeout(resolve, ms)); }
+
 if (cluster.isPrimary) { // Parent process with portal webserver through which clienta can bootstrap
+  const http = await import('node:http');
+  const express = (await import('express')).default;
+  const logger = (await import('morgan')).default;
+  const { configureWebsocket } = await import('./websocket.js');
+
   const port = parseInt((new URL(argv.baseURL)).port || '80');
   process.title = 'yz.social';
   const app = express();
   app.use(logger(':date[iso] :status :method :url :res[content-length] - :response-time ms'));
+  const server = http.createServer(app);
+  configureWebsocket(server);
 
   // if (argv.announce) { // The default is to not announce.
   //   let announce = null;
@@ -99,32 +101,44 @@ if (cluster.isPrimary) { // Parent process with portal webserver through which c
     extensions: ['js'] // Some dependencies refer to .js files as relative pathnames, with the .js missing.
   }));
 
-  app.listen(port);
-  console.log(new Date(), `Listening on ${port} and starting ${argv.nPortals} nodes on ${logicalCores} ${cpus()[0].model} logical cores.`);
+  server.listen(port);
+  log(`Listening on ${port} and starting ${argv.nPortals} nodes on ${logicalCores} ${cpus()[0].model} logical cores.`);
   for (let i = 0; i < argv.nPortals; i++) {
     cluster.fork();
-    await new Promise(resolve => setTimeout(resolve, 2e3)); // Number chosen to give an unspikey rise in packets/s.
+    await delay(); // Number chosen to give an unspikey rise in packets/s.
   }
+  log(process.title, 'RUNNING.');
+  process.on('SIGINT', async () => { // Leave the network politely.
+    const seconds = (1 + argv.nPortals) * argv.spacing;
+    log(process.title, 'shutting down', argv.nPortals, 'nodes.');
+    await delay(seconds * 1e3);
+    log(process.title, 'done');
+    process.exit(0);
+  });
 } else {
   process.title = 'axona-starting';
   const { P2PWebNetwork, location } = await import('../index.js');
   const network = await P2PWebNetwork.create({
     region: location,
-    infoLogger: (...rest) => argv.info && console.log(new Date(), ...rest),
-    debugLogger: (...rest) => argv.verbose && console.log(new Date(), ...rest)
+    infoLogger: log,
+    debugLogger: debug
   });
   process.title = 'axona-' + network.nodeIdentity.id;
-  let update = setInterval(() => {
-    const roles = network.peer.health().axonRoles;
-    network.debug(roles.length, 'axons',
-		  roles.reduce((total, role) => total + (role.isRoot ? 1 : 0), 0), 'roots');
-  }, 10e3);
+  let update = argv.verbose && setInterval(() => {
+    network.debug(network.peer.health());
+  }, 30e3);
   process.on('SIGINT', async () => { // Leave the network politely.
-    console.log(process.title, 'Shutdown for Ctrl+C');
-    clearInterval(update)
+    const id = cluster.worker.id;
+    const seconds = id * argv.spacing;
+    clearInterval(update);
+    log(process.title, 'Shutdown for Ctrl+C in', seconds, 'seconds.');
+    const health = network.peer.health();
+    const inRegionTags = network.inRegionConnections();
+    network.info(`Node ${id} has ${inRegionTags.length} connections in region.`);
+    network.info(network.ice(inRegionTags));
+    await delay(seconds * 1e3);
     await network.disconnect();
     process.exit(0);
-});
+  });
   await network.host();
-
 }

package/server/{location.json → location.save.json}

@@ -1,5 +1,5 @@
 {
-  "uswest/80": "37.4852,-122.2364",
+  "uswest/80": "37,-122",
   "useast/89": "40,-75",
   "uscentle/88": "35,-83",
   "easteu/47": "50,17",

package/server/websocket.js

@@ -0,0 +1,46 @@
+// Offer a websocket connection for testing, that skips the DHT entirely, and accepts publishing by pushing to subscribers over the websocket.
+import { WebSocketServer } from 'ws';
+import * as operator from '../public/javascripts/pubsub.js';
+
+const sockets = {};
+operator.setReceiver((nodeId, id, envelope) => {
+  const socket = sockets[nodeId];
+  socket.send(JSON.stringify([id, envelope]));
+});
+
+function heartbeat() {
+  this.isAlive = true;
+}
+
+export function configureWebsocket(server) {
+  const wss = new WebSocketServer({ server });
+  wss.on('connection', (ws, req) => {
+    const nodeTag = req.url.slice(1);
+    console.log('Connected', nodeTag);
+    sockets[nodeTag] = ws;
+
+    ws.on('message', async message => {
+      const [id, methodName, ...rest] = JSON.parse(message);
+      const result = await operator[methodName](...rest);
+      ws.send(JSON.stringify([id, result]));
+    });
+
+    ws.isAlive = true;
+    ws.on('pong', heartbeat);
+
+    ws.on('error', console.error);
+    ws.on('close', () => {
+      console.log('Disconnected', nodeTag);
+      operator.deleteSubscriber(nodeTag);
+    });
+  });
+
+  const interval = setInterval(function ping() { // Keep-alive ping/pong on interval
+    wss.clients.forEach(function each(ws) {
+      if (!ws.isAlive) return ws.terminate();
+      ws.isAlive = false;
+      ws.ping();
+      return null;
+    });
+  }, 30e3);
+}

package/spec/axonSpec.js

@@ -19,9 +19,7 @@
   Alice kills her publication and Emma joins.
 */
 const { describe, it, expect, beforeAll, afterAll, BigInt } = globalThis;
-import { createAuthorIdentity, regionCenter, geoCellId, geoCellCenter, WIRE_VERSION, KERNEL_VERSION, deriveTopicId, metricTopic } from '@axona/protocol';
-import { connect } from '@axona/protocol/connect.js';
-globalThis.RTCPeerConnection ||= await import('node-datachannel/polyfill').then(ndc => ndc.RTCPeerConnection);
+import { connect, createAuthorIdentity, regionCenter, geoCellId, geoCellCenter, WIRE_VERSION, KERNEL_VERSION, deriveTopicId, metricTopic } from '@axona/protocol';
 
 class Node {  // Stuff we have to do every time.
   static version = KERNEL_VERSION;
@@ -110,6 +108,7 @@ describe("CivilDefense", function () {
   const deliveryAllowanceMS = 60e3;
 
   //const location = regionCenter('uscentlw');
+  //const location = regionCenter('0x52');
   const location = regionCenter('uswest');  // TODO: pick one
   
   let alice, bob, carol, david, emma;
@@ -226,10 +225,12 @@ describe("CivilDefense", function () {
     });
   });
   afterAll(async function () {
-    await alice.disconnect();
-    await bob.disconnect();
-    await carol?.disconnect();
-    await david?.disconnect();
-    await emma?.disconnect();
+    await Promise.all([
+      alice.disconnect(),
+      bob.disconnect(),
+      carol?.disconnect(),
+      david?.disconnect(),
+      emma?.disconnect(),
+    ]);
   });
 });

package/public/junk.html

@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Material Web Autocomplete Combo Box</title>
-    <script type="importmap">
-      {
-        "imports": {
-          "uuid": "https://unpkg.com/uuid@13.0.0/dist/index.js",
-          "@material/web/": "https://esm.run/@material/web/",
-          "s2js": "./s2js/s2js.esm.js",
-	  "bigfloat": "./bigfloat/esm/index.js",
-	  "leaflet": "./leaflet/leaflet-src.esm.js",
-	  "minidenticons": "./minidenticons/minidenticons.min.js",
-	  "@axona/protocol": "./axona-protocol/src/index.js",
-          "@axona/protocol/std": "./axona-protocol/std/index.js",
-	  "@axona/protocol/connect.js": "./axona-protocol/src/connect.js"
-        }
-      }
-    </script>
-    <script type="module">
-      import '@material/web/all.js';
-      import {styles as typescaleStyles} from '@material/web/typography/md-typescale-styles.js';
-      document.adoptedStyleSheets.push(typescaleStyles.styleSheet);
-    </script>
-  <!-- Load Material Web Components via CDN -->
-  <!-- <script type="module"> -->
-  <!--   import '@material/web/textfield/filled-text-field.js'; -->
-  <!--   import '@material/web/menu/menu.js'; -->
-  <!--   import '@material/web/menu/menu-item.js'; -->
-  <!-- </script> -->
-  <style>
-    .combo-box-container {
-      position: relative;
-      display: inline-block;
-      width: 300px;
-      margin: 40px;
-    }
-    md-filled-text-field {
-      width: 100%;
-    }
-    md-menu {
-      /* Match the width of the textfield anchor */
-      --md-menu-container-width: 300px; 
-    }
-  </style>
-</head>
-<body>
-
-  <div class="combo-box-container">
-    <!-- The editable text input acting as the anchor -->
-    <md-filled-text-field 
-      id="combo-input" 
-      label="Choose a fruit" 
-      placeholder="Type to search..."
-      autocomplete="off">
-    </md-filled-text-field>
-
-    <!-- The dropdown menu containing autocomplete suggestions -->
-    <md-menu id="combo-menu" anchor="combo-input" stay-open-on-outside-click>
-      <!-- Populated dynamically via JavaScript -->
-    </md-menu>
-  </div>
-
-  <script>
-    const input = document.getElementById('combo-input');
-    const menu = document.getElementById('combo-menu');
-
-    // Dataset for autocomplete
-    const itemsList = [
-      'Apple', 'Banana', 'Blueberry', 'Cherry', 'Grape', 
-      'Lemon', 'Mango', 'Orange', 'Peach', 'Strawberry'
-    ];
-
-    // Build and filter menu items based on input value
-    function updateMenu(filterText = '') {
-      const normalizedFilter = filterText.toLowerCase().trim();
-      
-      // Filter list items
-      const filtered = itemsList.filter(item => 
-        item.toLowerCase().includes(normalizedFilter)
-      );
-
-      // Clear existing menu items
-      menu.innerHTML = '';
-
-      if (filtered.length === 0) {
-        // Show a disabled helper item if no match found
-        const noResult = document.createElement('md-menu-item');
-        noResult.disabled = true;
-        //noResult.headline = 'No matches found';
-	noResult.textContent  = 'No matches found';
-        menu.appendChild(noResult);
-        return;
-      }
-
-      // Append matched options
-      filtered.forEach(item => {
-        const menuItem = document.createElement('md-menu-item');
-        //menuItem.headline = item;
-	menuItem.textContent = item;
-        // Store raw value on the element for extraction during selection
-        menuItem.dataset.value = item; 
-        menu.appendChild(menuItem);
-      });
-    }
-
-    // Filter list and open menu as user types
-    input.addEventListener('input', (e) => {
-      updateMenu(e.target.value);
-      if (!menu.open) {
-        menu.open = true;
-      }
-    });
-
-    // Re-open full menu list when user clicks or focuses inside the input
-    input.addEventListener('focus', () => {
-      updateMenu(input.value);
-      menu.open = true;
-    });
-
-    // Handle selection event from the Material menu
-    menu.addEventListener('close-menu', (e) => {
-      // e.detail.item holds the clicked md-menu-item instance
-      const selectedItem = e.detail.item;
-      if (selectedItem && selectedItem.dataset.value) {
-        input.value = selectedItem.dataset.value;
-        // Optionally trigger a change event for form tracking
-        input.dispatchEvent(new Event('change'));
-      }
-    });
-
-    // Close the dropdown cleanly if the user hits "Escape" or "Enter" inside input
-    input.addEventListener('keydown', (e) => {
-      if (e.key === 'Escape' || e.key === 'Enter') {
-        menu.open = false;
-        if(e.key === 'Enter') input.blur();
-      }
-    });
-
-    // Initial population of the menu
-    updateMenu();
-  </script>
-</body>
-</html>