@yz-social/kdht 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yz-social/kdht",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Pure Kademlia base, for testing variations.",
   "exports": {
     ".": "./index.js",

package/portals/node.js

@@ -28,4 +28,10 @@ export async function setup({baseURL, externalBaseURL = '', verbose, fixedSpacin
   const bootstrap = joinURL && await contact.ensureRemoteContact(bootstrapName, joinURL);
   process.send(contact.sname); // Report in to server as available for others to bootstrap through.
   if (bootstrap) await contact.join(bootstrap);
+  process.on('SIGINT', async () => {
+    console.log(process.title, 'Shutdown for Ctrl+C');
+    await contact.disconnect();
+    process.exit(0);
+  });
+  return contact;
 }

package/spec/bots.js

@@ -62,6 +62,12 @@ let bootstrapName = await contact.fetchBootstrap(argv.baseURL);
 let bootstrapContact = await contact.ensureRemoteContact(bootstrapName, argv.baseURL);
 await contact.join(bootstrapContact);
 
+process.on('SIGINT', async () => {
+  console.log(process.title, 'Shutdown for Ctrl+C');
+  await contact.disconnect();
+  process.exit(0);
+});
+
 while (argv.thrash) {
   await Node.delay(contact.host.fuzzyInterval(Node.refreshTimeIntervalMS));
   const old = contact;

package/spec/node.html

@@ -19,29 +19,34 @@
       import { v4 as uuidv4 } from 'uuid';
       import { WebContact } from '@yz-social/kdht';
       Object.assign(globalThis, {uuidv4, WebContact });
+      const bootstrapBase = new URL('/kdht', origin).href; // Must be a string
+      let contact;
 
-      let name = localStorage.getItem('name');
-      if (!name) {
-	name = uuidv4();
-	localStorage.setItem('name', name);
+      async function connect() { // Connect or reconnect to the network.
+	const name = uuidv4();
+	contact = globalThis.contact = await WebContact.create({name});
+	const bootstrapName = await contact.fetchBootstrap(bootstrapBase);
+	console.log('connecting to', bootstrapName);
+	const bootstrapContact = globalThis.bootstrapContact = await contact.ensureRemoteContact(bootstrapName, bootstrapBase);
+	await contact.join(bootstrapContact);
+	update.onclick();
       }
-      const contact = globalThis.contact = await WebContact.create({name});
-      const bootstrapBase = new URL('/kdht', origin).href; // Must be a string
-      const bootstrapName = await contact.fetchBootstrap(bootstrapBase);
-      console.log('connecting to', bootstrapName);
-      const bootstrapContact = globalThis.bootstrapContact = await contact.ensureRemoteContact(bootstrapName, bootstrapBase);
-      await contact.join(bootstrapContact);
-      console.log('connected');
 
       update.onclick = () => {
         const report = contact.node.report(null);
-        console.log({report, display});
         display.textContent = report;
       };
-      update.onclick();
+      await connect();
 
       write.onclick = () => contact.storeValue(key.value, writeValue.value);
       read.onclick = () => contact.node.locateValue(key.value).then(value => readValue.value = value);
+      document.addEventListener("visibilitychange", () => {
+	if (document.hidden) {
+	  contact.disconnect();
+	} else {
+	  connect();
+	}
+      });
     </script>
   </body>    
 </html>  

package/spec/portal.js

@@ -115,5 +115,5 @@ if (cluster.isPrimary) { // Parent process with portal webserver through which c
 } else { // A portal node through which client's can connect.
   const portalNode = await import('../portals/node.js');
   const {baseURL, externalBaseURL, fixedSpacing, variableSpacing, verbose} = argv;
-  portalNode.setup({baseURL, externalBaseURL, fixedSpacing, variableSpacing, verbose});
+  await portalNode.setup({baseURL, externalBaseURL, fixedSpacing, variableSpacing, verbose});
 }

package/transports/webrtc.js

@@ -209,6 +209,7 @@ export class WebContact extends Contact { // Our wrapper for the means of contac
     // If we find that in our inFlight tags, then the message is a response.
     if (dataString === '"bye"') { // Special messsage that the other side is disconnecting, so we can clean up early.
       this.webrtc.close();
+      this.host.xlog('removing disconnected contact', this.sname);
       await this.host.removeContact(this);  // TODO: Make sure we're not invoking this in maxTransports cases.
       return;
     }