@yz-social/civildefense.io 4.5.7 → 4.5.9

package/server/app.js

@@ -46,6 +46,12 @@ const argv = yargs(hideBin(process.argv))
 	default: 5,
 	description: "Additional variable seconds (+/- variableSpacing/2) to add to fixedSpacing between each portal."
       })
+      .option('info', {
+	alias: 'i',
+	type: 'boolean',
+	default: true,
+	description: "Run with info logging."
+      })
       .option('verbose', {
 	alias: 'v',
 	type: 'boolean',
@@ -94,20 +100,28 @@ if (cluster.isPrimary) { // Parent process with portal webserver through which c
   }));
 
   app.listen(port);
-  console.log('Listening on', port, 'and starting', argv.nPortals, 'nodes.');
+  console.log(new Date(), `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, 1e3));
+    await new Promise(resolve => setTimeout(resolve, 2e3)); // Number chosen to give an unspikey rise in packets/s.
   }
 } else {
   process.title = 'axona-starting';
   const { P2PWebNetwork, location } = await import('../index.js');
-  const network = await P2PWebNetwork.create({region: location});
+  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)
+  });
   process.title = 'axona-' + network.nodeIdentity.id;
-  //let update = setInterval(() => network.info(network.peer.health().axonRoles.length, 'axons'), 10e3);
+  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);
   process.on('SIGINT', async () => { // Leave the network politely.
     console.log(process.title, 'Shutdown for Ctrl+C');
-    //clearInterval(update)
+    clearInterval(update)
     await network.disconnect();
     process.exit(0);
 });

package/server/location.json

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

package/spec/conversationSpec.js

@@ -31,8 +31,8 @@ describe("Conversation", function () {
       let keep = true;
       let tag = "caching";
       class CacheConversation extends Conversation {
-	update() { return keep && this; }
-	initialize() { return keep && this; }
+	update(properties) { return keep && super.update(properties); }
+	initialize(properties) { return keep && super.initialize(properties); }
       }
       it("ends with explicit removal.", async function () {
 	let initial = await Conversation.ensure({tag, agent, payload});