@yz-social/civildefense.io 4.5.21 → 4.5.23

package/public/javascripts/conversation.js

@@ -19,7 +19,7 @@ export class Tagged { // Maintains cached existence within a (possibly instance-
     for (const key in properties) {
       const existing = this[key];
       const proposed = properties[key];
-      if (JSON.stringify(existing) !== JSON.stringify(proposed)) throw new Error(`Cannot update '${key}' from ${existing} to ${proposed}.`);
+      if (JSON.stringify(existing) !== JSON.stringify(proposed)) throw new Error(`Cannot update '${key}' in ${this.constructor.name} ${this.tag} from ${JSON.stringify(existing)} to ${JSON.stringify(proposed)}.`);
     }
     return this;
   }
@@ -32,13 +32,15 @@ export class Tagged { // Maintains cached existence within a (possibly instance-
 
   static async ensureIn(data, container, kind = container.itemKind) { // update() or initialize() item and remember what those answer. (Falsy is deleted).
     const {tag, payload, ...rest} = data;
-    let item = container.getItem(tag);
+    let item = container.getItem(tag); // existing item
     if (!payload) return item?.destroy();
+
+    // update or create item.
     if (item) item = await item.update(data);
     else item = await (new kind().initialize({...data, container}));
 
     if (!item) return container.removeItem(tag)?.destroy();
-    return container.setItem(tag, item);
+    return container.setItem(item.tag, item); // initialize() may come up with a better tag.
   }
 }
 

package/public/javascripts/hashtags.js

@@ -133,7 +133,8 @@ export const Hashtags = {
     return `<md-filter-chip label="${label}" elevated removable
         ${active === 'pub' ? 'class="pub"' : ''}
         ${active ? ' selected' : ''}
-      >${this.firstEmoji(label) ? '' : this.identicon(label, 'selected-icon')}
+      >${this.firstEmoji(label) ? '' :
+        `<div slot="selected-icon" class="identicon"><md-icon class="material-icons">checkmark</md-icon> ${this.identicon(label)}</div>`}
         <md-icon-button slot="remove-trailing-icon"><md-icon class="material-icons"></md-icon></md-icon-button>
       </md-filter-chip>`;
   },

package/public/javascripts/map.js

@@ -83,7 +83,7 @@ export var trackMap;
 export function initMap(lat, lng, zoom, positionLabel) { // Set up appropriate zoomed initial map and handlers for this position.
   // Then show initial message and updateSubscriptions.
 
-  P2PWebNetwork.setSessionRegion({lat, lng});
+  P2PWebNetwork.setSessionLocation({lat, lng});
 
   // Map will be centered at the given current location marker, unless overriden by query parameters.
   let center = {lat, lng};

package/public/javascripts/p2pWebNetwork.js

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { connect, createAuthorIdentity, geoCellId, geoCellCenter, WIRE_VERSION, KERNEL_VERSION } from './protocol.js';
+import { connect, createAuthorIdentity, geoCellId, geoCellCenter, WIRE_VERSION, KERNEL_VERSION, dht } from './protocol.js';
 import { stringToBytes, bytesToString, publishChunkedBytes, receiveChunkedBytes } from './protocol.js';
 
 if (!Uint8Array.prototype.toBase64) { // NodeJS < 24
@@ -16,37 +16,38 @@ const { BigInt, URL, File, pica } = globalThis;
    await network.disconnect();
  */
 
-const {promise:sessionRegionPromise, resolve:resolveSessionRegion} = Promise.withResolvers();
+const {promise:sessionLocationPromise, resolve:resolveSessionLocation} = Promise.withResolvers();
 
 export class P2PWebNetwork {
   static wireVersion = WIRE_VERSION;
   static kernelVersion = KERNEL_VERSION;
   static createAuthorIdentity = createAuthorIdentity;
-  static setSessionRegion = resolveSessionRegion;
-  static sessionRegion = sessionRegionPromise;
+  static setSessionLocation = resolveSessionLocation;
+  static sessionLocation = sessionLocationPromise;
   static async create({infoLogger = console.log, debugLogger,
-		       region = this.sessionRegion,
+		       location = this.sessionLocation,
 		       bridgeUrl = (globalThis.location && new URL(globalThis.location).searchParams.get('bridge')) ||
 		       globalThis.process?.env.BRIDGE_URL ||
-		       (parseInt(new URL(globalThis.location || 'file://').searchParams.get('dht')) <= 0 && // fixme remove when we host bridges
-			globalThis.location?.origin.replace(/^http/, 'ws')) ||
+		       ((dht <= 0) && // fixme remove when we host bridges
+			(globalThis.location?.origin.replace(/^http/, 'ws') ||
+			 'ws://localhost:3000')) ||
 		       'wss://bridge.axona.net',
 		      } = {}) {
     // Promise a ready-to-use network peer.
-    region = await region;
+    location = await location;
 
     const network = new this();
     network.resetStatePromises();
 
     const { peer, nodeIdentity, transport, status, disconnect } = await connect({
       bridge: bridgeUrl,
-      location: region,
+      location,
       onDisconnect: network.detached,
       author: false
     });
     Object.assign(network, {infoLogger, debugLogger, disconnector: disconnect, transport, nodeIdentity, peer});
 
-    network.info(`Created network node for kernel ${this.kernelVersion} region 0x${this.regionCode(region.lat, region.lng).toString(16)}.`);
+    network.info(`Created network node for kernel ${this.kernelVersion} region 0x${this.regionCode(location.lat, location.lng).toString(16)}.`);
     peer.onError(error => {
       network.info(`error: ${error.message || error}`);
       throw error;
@@ -250,7 +251,7 @@ export class P2PWebNetwork {
   }
   shortHealth(health = this.peer.health()) { // Info-report a short form of health.
     const roots = health.axonRoles.filter(r => r.isRoot);
-    this.info(`disconnected with connections ${health.peers.map(P2PWebNetwork.short)}\nand ${roots.length ? `roots ${roots.map(r => P2PWebNetwork.short(r.topic))}.` : 'no roots.'}`);
+    this.info(`disconnected with ${health.peers.length} connections: ${health.peers.map(P2PWebNetwork.short)}\nand ${roots.length ? `roots ${roots.map(r => P2PWebNetwork.short(r.topic))}.` : 'no roots.'}`);
   }
   inRegionConnections(health = this.peer.health()) {
     const region = this.nodeIdentity.id.slice(0, 2);

package/public/javascripts/protocol.js

@@ -3,15 +3,18 @@ const { TextEncoder, TextDecoder, BigInt, URL, WebSocket, Buffer } = globalThis;
 
 let connect, createAuthorIdentity, geoCellId, geoCellCenter, WIRE_VERSION, KERNEL_VERSION, stringToBytes, bytesToString, publishChunkedBytes, receiveChunkedBytes;
 
-// dht 1  -> Axona (default)
+// dht 1  -> Axona
 // dht 0  -> server
 // dht -1 -> in-memory on client only
-const dht = parseInt(globalThis.process ? globalThis.process.env.DHT : new URL(globalThis.location).searchParams.get('dht'));
+const defaultDHT = globalThis.process ? 1 : 0; // Browser defaults to no Axona. Server nodes and alert-bot default to Axona.
+export const dht = parseInt((globalThis.process ?
+			     globalThis.process.env.DHT :
+			     new URL(globalThis.location).searchParams.get('dht')) ?? defaultDHT);
 
 if (dht < 1) {
 
   const { v4:uuidv4 } = await import('uuid');
-  const { getContainingCells, getPointInCell } = await import('./s2.js');
+  const { getSmallestCellId, getPointInCell } = await import('./s2.js');
   const { cellHex } = await import('./versions.js');
   const operator = await import('./pubsub.js');
 
@@ -35,8 +38,8 @@ if (dht < 1) {
       return {authorId: tag};
     };
   geoCellId = (lat, lng) => {
-    const cells = getContainingCells(lat, lng);
-    const hex = cellHex(cells[0]);
+    const cellid = getSmallestCellId(lat, lng);
+    const hex = cellHex(cellid);
     const sliced = hex.slice(0, 2);
     return parseInt(sliced, 16); // The worst way to do this.
   };
@@ -93,16 +96,18 @@ if (dht < 1) {
 	  const [tag, ...rest] = JSON.parse(event.data);
 	  const subHandler = handlers[tag];
 	  const inFlightResolver = inFlight[tag];
-	  if ((!subHandler && !inFlightResolver) ||
+
+	  if ((!subHandler && !inFlightResolver) || // debug
 	      ((typeof(subHandler) !== 'function') && (typeof(inFlightResolver) !== 'function')))
-	    console.log({tag, rest, subHandler, inFlightResolver, handlers, inFlight});
+	    console.warn('no handler or request', {tag, rest, subHandler, inFlightResolver, handlers, inFlight});
+
 	  if (subHandler) return subHandler(...rest);
 	  delete inFlight[tag];
 	  return inFlightResolver?.(...rest);
 	};
 	socket.onopen = () => {
 	  if (socket.readyState !== WebSocket.OPEN) return; // You would think that can't happen, but...
-	  resolve((...rest) => { // send()
+	  resolve((...rest) => { // Promise the send() function.
 	    const tag = uuidv4();
 	    const {promise, resolve} = Promise.withResolvers();
 	    inFlight[tag] = resolve;
@@ -149,10 +154,12 @@ if (dht < 1) {
       kill(topic, msgId, options) {
 	return send('unpublish', topic, msgId, options);
       },
+      lookup() { return {}; },
       host() {},
       unhost() {}
     };
     const status = {peers: 0, ms: 0}; // fixme ms
+    await new Promise(resolve => setTimeout(resolve, 1e3)); // Simulate finding peers, and give the app some time to do stuff.
     return { peer, nodeIdentity, transport, status, disconnect };
   };
 

package/public/javascripts/pubsub.js

@@ -1,9 +1,18 @@
 // In memory pubsub, for either client-only testing, or server-websocket testing
 const { v4:uuidv4 } = await import('uuid');
 const { TextEncoder, crypto, Buffer } = globalThis;
+const publicationRolloverLimit = 1000;
 
 function setBucket(collection, type, topicId, subject, value) { // Set value in the collection.
   const bucket = collection[type][topicId] ||= {};
+  if ((collection === data) && (type === 'pub')) {
+    const keys = Object.keys(bucket);
+    const size = keys.length;
+    if (size >= publicationRolloverLimit) {
+      console.warn('Over pub limit on topic', topicId, size); // TODO: rotate out the earliest received.
+      delete bucket[keys[0]];
+    }
+  }
   bucket[subject] = value;
 }
 function removeBucket(collection, type, topicId, subject) { // Return the value and stop storing it.
@@ -20,7 +29,7 @@ const PUBLISH_TIMEOUT = 24 * 60 * 60e3;      // Delete after 24 hours.
 const timeouts = {pub: {}, sub: {}};
 function expire(type, topicId, subject, remover, timeout) { // Cancellably schedule remover() to fire at timeout.
   if (!timeout) return;
-  setBucket(timeouts, type, topicId, subject, setTimeout(remover, timeout));
+  setBucket(timeouts, type, topicId, subject, setTimeout(() => { remover(); cancel(type, topicId, subject); }, timeout));
 }
 function cancel(type, topicId, subject) { // Cancel a sheduled expiration.
   clearTimeout(removeBucket(timeouts, type, topicId, subject));
@@ -46,25 +55,34 @@ function normalizeTopic({name, region, owner, write = 'open'} = {}) {
 function deriveTopicId(topic) {
   return JSON.stringify(normalizeTopic(topic)); // No need to hash in this implementation.
 }
+function delay(ms = 0) {
+  return ms && new Promise(resolve => setTimeout(resolve, ms));
+}
 
 let invoke;
 export function setReceiver(receiver) {
   invoke = receiver;
 }
+const throttleMS = 30; // Just to yield to other stuff.
+async function pauseInvoke(...rest) {
+  invoke(...rest);
+  await new Promise(resolve => setTimeout(resolve, throttleMS));
+}
 
-export function subscribe(topicName, nodeTag, {since = 'all'}) {
+export async function subscribe(topicName, nodeTag, {since = 'all'}) {
   // Axona allows multiple handlers on the same topic, but we don't use that in civildefense, and do not implement it here.
   const topicId = deriveTopicId(topicName);
   const id = uuidv4();
   cancel('sub', topicId, id);
   expire('sub', topicId, id, () => deleteSub(topicId, id), SUBSCRIPTION_TIMEOUT);
   setBucket(data, 'sub', topicId, nodeTag, id);
-  if (since) setTimeout(() => { // invoke handler on any sticky data, but only after we have told client the subscription id.
+  if (since) { // invoke handler on any sticky data, but only after we have told client the subscription id.
+    await delay(100);
     let lastEnvelope = null, lastTime = 0;
     for (const envelope of getDataValues('pub', topicId)) {
       switch (since) {
       case 'all':
-	invoke(nodeTag, id, envelope);
+	await pauseInvoke(nodeTag, id, envelope);
 	break;
       case 'latest':
 	if (envelope.ts > lastTime) {
@@ -73,11 +91,11 @@ export function subscribe(topicName, nodeTag, {since = 'all'}) {
 	}
 	break;
       default: // Must be a timestamp
-	if (envelope.ts === since) invoke(nodeTag, id, envelope);
+	if (envelope.ts === since) await pauseInvoke(nodeTag, id, envelope);
       }
     }
     if (lastEnvelope) invoke(nodeTag, id, lastEnvelope);
-  }, 100);
+  }
   return {topicName, topicId, id};
 }
 
@@ -92,7 +110,10 @@ export function deleteSubscriber(nodeTag) {
   for (const topicId in data.sub)  {
     const keySubs = data.sub[topicId];
     for (const [subject, value] of Object.entries(keySubs)) {
-      if (nodeTag === subject) deleteSub(topicId, subject, keySubs);
+      if (nodeTag === subject) {
+	deleteSub(topicId, subject, keySubs);
+	cancel('sub', topicId, subject);
+      }
     }
   }
 }
@@ -106,19 +127,19 @@ export async function publish(topic, message, {signWith}) {
   const hash = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(payload));
   const msgId = toHex(new Uint8Array(hash));
   const envelope = {msgId, topic, ts: Date.now(), message, signerPubkey};
-  for (const [nodeTag, id] of getDataEntries('sub', topicId)) invoke(nodeTag, id, envelope);
+  for (const [nodeTag, id] of getDataEntries('sub', topicId)) await pauseInvoke(nodeTag, id, envelope);
   setBucket(data, 'pub', topicId, msgId, envelope);
   expire('pub', topicId, msgId, () => removeBucket(data, 'pub', topicId, msgId), PUBLISH_TIMEOUT);
   return msgId;
 }
 
-export function unpublish(topic, msgId, {signWith}) {
+export async function unpublish(topic, msgId, {signWith}) {
   const topicId = deriveTopicId(topic);  
   cancel('pub', topicId, msgId);
   const envelope = removeBucket(data, 'pub', topicId, msgId);
   if (!envelope) return {ok: false}; // we didn't have it.
   envelope.deleted = true;
   envelope.message = null;
-  for (const [nodeTag, id] of getDataEntries('sub', topicId)) invoke(nodeTag, id, envelope);
+  for (const [nodeTag, id] of getDataEntries('sub', topicId)) await pauseInvoke(nodeTag, id, envelope);
   return {ok: true};
 }

package/public/javascripts/s2.js

@@ -1,6 +1,7 @@
 import { s2, s1, r1 } from 's2js';
 const { cellid, LatLng, Point, Cell, Cap, RegionCoverer } = s2;
 import { cellHex } from './versions.js';
+import { geoCellCenter/*, geoCellId*/ } from '@axona/protocol';
 const { BigInt } = globalThis;
 
 // s2 defines non-overlapping cells that completely cover the globe, at several different levels of cell-size.
@@ -12,43 +13,59 @@ const { BigInt } = globalThis;
 // Meanwhile as the user changes the area being shown, we subscribe to whatever cells we need in order to cover the display
 // area without overlapping cells.
 
-export const MIN_LEVEL = 3; // Corresponds to the top level Axona regions.
+export const MIN_LEVEL = 3; // The largest cell that is still smaller than an Axona region.
 const MAX_S2_LEVEL = 30; // The leaf level that Cell.fromPoint operates at.
 const MAX_MAP_LEVEL = 17; // The max level that findCoverCellsByCenterAndRadius will use on our maps.
 
 const EARTH_RADIUS_METERS = 6371e3;
 
 export function getPointInCell(cellId) { // answer [lat, lng] in degrees from a BigInt
+  // const {lat, lng} = geoCellCenter(cellid);
+  // return [lat, lng];
   // CAUTION: This is intended for s2 level 3 or finer, and won't always work symmetrically for our top-level regions.
   // e.g. getContainingCells(...getPointInCell( cell for 0x47 )][0] is 0x46!
   let center = s2.cellid.latLng(cellId);
   return [s1.angle.degrees(center.lat), s1.angle.degrees(center.lng)];
 }
 
-function getCellSubdivision(cell) {
+function getCellSubdivision(cell) { // Answer four children off BigInt cell, as BigInt.
   return cellid.children(cell);
 }
-function getCellLevel(cell) {
+export function getSubdivision(hexString) { // Same as getCellSubDivision, but accepting and returning hex strings.
+  return getCellSubdivision(BigInt('0x' + hexString)).map(childCell => cellHex(childCell));
+}
+function getCellLevel(cell) { // Answer level of BigInt cell, as number.
   return cellid.level(cell);
 }
-function getFace(cell) {
+function getCellFace(cell) { // Answer top level face id of BigInt cell, as integer 0 through 5.
   return cellid.face(cell);
 }
-export function getSubdivision(hexString) {
-  return getCellSubdivision(BigInt('0x' + hexString)).map(childCell => cellHex(childCell));
+export function cellContains(putativeOuter, putativeInner) { // Answer true IFF putativeOuter BigInt cell contains putativeInner
+  return cellid.contains(putativeOuter, putativeInner);
+}
+export function pointFromLatLng(lat, lng) { // Answer an s2 Point from lat/lng in degrees.
+  const latLng = LatLng.fromDegrees(lat, lng);
+  return Point.fromLatLng(latLng);
+}
+export function cellFromCellID(bigint) {
+  return Cell.fromCellID(bigint);
+}
+export function getSmallestCellId(lat, lng, level = MAX_MAP_LEVEL) { // Answer smallest BigInt cellid containing latitude/longitude in degrees, at integer level.
+  const userPt = pointFromLatLng(lat, lng);
+  const userLocCellId = Cell.fromPoint(userPt).id; // This is at MAX_S2_LEVEL
+  return cellid.parent(userLocCellId, level);
 }
 
-// Return a list of the cell ids that contain the point.
+// Return a list of the cell ids that contain the point, from region to MAX_S2_LEVEL
+// Note that the first of the cells (the region
 export function getContainingCells(lat, lng) {
-  const userLatLng = LatLng.fromDegrees(lat, lng);
-  const userPt = Point.fromLatLng(userLatLng);
-  // Get leaf-level CellId (level 30)
-  const userLocCellId = Cell.fromPoint(userPt).id; // This is at level 30.
-  let cells = Array(MAX_S2_LEVEL);
-  for (let level = 0; level <= MAX_S2_LEVEL; level++) { // This would be more efficient going backwards using immediateParent, but who cares.
-    cells[level] = cellid.parent(userLocCellId, level);
+  let id = getSmallestCellId(lat, lng);
+  const level = MAX_MAP_LEVEL, cells = Array(MAX_MAP_LEVEL + 1 - MIN_LEVEL);
+  for (let index = level - MIN_LEVEL; index >= 0; index--) {
+    cells[index] = id;
+    id = cellid.immediateParent(id);
   }
-  return cells.slice(MIN_LEVEL, MAX_MAP_LEVEL + 1); // We can only make use between Axona region size and the smallest region our maps subscribe to.
+  return cells;
 }
 
 export function findCoverCellsByMinMaxLatLng({minLat, maxLat, minLng, maxLng, full = false,
@@ -58,8 +75,8 @@ export function findCoverCellsByMinMaxLatLng({minLat, maxLat, minLng, maxLng, fu
 
   // There are a lot of ways that seem like they do this, but it is very easy to find something that works for a few cases,
   // but misses cells in some circumstances, so be wary about rewriting this.
-  const lo = s2.LatLng.fromDegrees(minLat, Math.max(minLng, -180));
-  const hi = s2.LatLng.fromDegrees(maxLat, Math.max(maxLng, 190));
+  const lo = LatLng.fromDegrees(minLat, minLng);
+  const hi = LatLng.fromDegrees(maxLat, maxLng);
 
   const rect = full ? s2.Rect.fullRect() : new s2.Rect(
     new r1.Interval(lo.lat, hi.lat),
@@ -69,4 +86,3 @@ export function findCoverCellsByMinMaxLatLng({minLat, maxLat, minLng, maxLng, fu
   const coverer = new RegionCoverer({minLevel, maxLevel, maxCells});
   return coverer.covering(rect); // a CellUnion — array-like of bigint cell IDs, already normalized/minimal
 }
-

package/public/javascripts/versions.js

@@ -25,10 +25,13 @@ export function cellHex(cellid) { // Convert cellid BigInt to properly padded he
 export function alertTopic(cellid, tag) { // Return topic name for public info about specified tag in cellid.
   return `civildefense.io:${dataVersion}:${cellHex(cellid)}:${canonicalTag(tag)}`;
 }
-export function topicCell(topicName) { // Return the cell that is baked in to the topic.
+export function topicCellHex(topicName) { // Return the hex string cell that is baked in to the topic.
   // Note that canonicalTag(tag) may contain a colon, but dataVersion must not.
   return topicName.match(/civildefense.io:[^:]+:([a-z0-9]+):/)[1];
 }
+export function topicCell(topicName) { // Return the BigInt cell that is baked in to the topic.
+  return BigInt('0x' + topicCellHex(topicName));
+}
 export function topicRegion(topicName) { // Return the region that is baked in to the topic.
-  return '0x' + topicCell(topicName).slice(0, 2);
+  return '0x' + topicCellHex(topicName).slice(0, 2);
 }

package/public/service-worker.js

@@ -1,6 +1,6 @@
 const { Request, Response, URL, clients} = self;
 // Little point in trying to automatically pull this through package.json, as we need a byte change in THIS file to trigger a new worker.
-const serviceVersion = '4.5.21';
+const serviceVersion = '4.5.23';
 
 const cacheList = [ // The files we need.
   "/",
@@ -124,6 +124,8 @@ async function cacheFirst({request, event}) {
   try {
     const responseFromNetwork = await fetch(request);
     if (request.method !== 'GET' || request.cache === 'no-store') return responseFromNetwork; // Cache shouldn't allow anyway.
+    const mime = responseFromNetwork.headers.get("Content-Type");
+    if (/^(audio|video)\//.test(mime)) return responseFromNetwork; // Do not cache streamable media.
     // Put clone of response in cache (so that original can be returned.
     // Tell event to keep worker open while we put it, even though we return response immediately.
     const cache = await caches.open(serviceVersion);

package/public/stylesheets/style.css

@@ -254,6 +254,7 @@ button, .leaflet-control-zoom > a, .leaflet-popup-close-button, md-outlined-icon
 .alert-marker {
     text-shadow: 8px -3px 10px rgb(0 0 0 / 60%);
     animation: pulse ease 0.8s 1;
+    transition: transform 0.8s, opacity 0.4s;
 }
 .alert-commented {
     display: none;
@@ -271,6 +272,30 @@ button, .leaflet-control-zoom > a, .leaflet-popup-close-button, md-outlined-icon
     left: 5px;
     text-align: center;
 }
+.aggregate.alert-pin {
+    font-size: 60px;
+    line-height: 60px;
+    top: -10px;
+    left: -10px;
+    transition: font-size 0.8s;
+}
+.aggregate.alert-pin:after {
+    content: "";
+    width: 70px;
+    height: 70px;
+    position: absolute;
+    top: -5px;
+    left: -5px;
+    background-image: radial-gradient(transparent 30%, var(--md-sys-color-primary), transparent 70%);
+    transition: opacity 0.8s;
+    animation: pulse ease 0.8s 1;
+}
+.aggregate.alert-pin.starting {
+    font-size: 0px;
+}
+.aggregate.alert-pin.starting:after {
+    opacity: 0;
+}
 @keyframes pulse {
     0% { filter: saturate(1); }
     25% { filter: saturate(4); }
@@ -303,9 +328,29 @@ button, .leaflet-control-zoom > a, .leaflet-popup-close-button, md-outlined-icon
 md-filter-chip {
     --md-sys-color-surface-container-low: #B8C2D7; /* non-selected elevated filter chip */
 }
-md-filter-chip minidenticon-svg + md-icon-button {
+md-filter-chip minidenticon-svg + md-icon-button,
+md-filter-chip .identicon + md-icon-button {
     bottom: 10px;
 }
+md-filter-chip .identicon md-icon {
+    font-size: 18px;
+    width: 20px;
+    position: relative;
+    bottom: 3px;
+}
+md-filter-chip .identicon {
+    width: 43px;
+}
+md-filter-chip .identicon minidenticon-svg {
+    width: 18px;
+    display: inline-block;
+    position: relative;
+    bottom: 5px;
+    left: -3px;
+}
+md-filter-chip minidenticon-svg {
+    background: white;
+}
 md-filter-chip md-icon-button {
     position: relative;
     bottom: 3px;
@@ -323,9 +368,6 @@ md-filter-chip:not([selected]) md-icon::after {
 md-filter-chip.pub md-icon {
     color: var(--md-sys-color-secondary);
 }
-md-filter-chip minidenticon-svg {
-    background: white;
-}
 md-outlined-icon-button minidenticon-svg, md-outlined-icon-button img {
     height: 40px;
     width: 40px;

package/server/app.js

@@ -14,18 +14,33 @@ const argv = yargs(hideBin(process.argv))
       .option('nPortals', {
 	alias: 'p',
 	type: 'number',
-	default: Math.max(2, logicalCores - 3),
+	default: process.env.PORTALS ? parseInt(process.env.PORTALS) : Math.max(2, logicalCores - 3),
 	description: "The number of steady nodes that handle initial connections."
       })
+      .option('regionStartIndex', {
+	type: 'number',
+	default: -1,
+	description: "If non-negative, place each of the nPortals in successive regions (excluding excludedRegionFromSeries) starting with the region at regionStaartIndex."
+      })
+      .option('excludedRegionFromSeries', {
+	type: 'string', array: true,
+	default: ['80', '88', '89'],
+	description: "If regionStartIndex is used, the ordered list of regions to occupy is the list of canonical regions less these."
+      })
       .option('baseURL', {
 	type: 'string',
-	default: 'http://localhost:3000',
+	default: process.env.BRIDGE_URL || 'wss://bridge.axona.net',
 	description: "The base URL of the portal server through which to bootstrap."
       })
-      .option('externalBaseURL', {
-	type: 'string',
-	default: '',
-	description: "The base URL of the some other portal server to which we should connect ours, if any."
+      // .option('externalBaseURL', {
+      // 	type: 'string',
+      // 	default: '',
+      // 	description: "The base URL of the some other portal server to which we should connect ours, if any."
+// })
+      .option('port', {
+	type: 'number',
+	default: 3000,
+	description: "Port for the server to listen on."
       })
       .option('announce', {
 	type: 'boolean',
@@ -61,7 +76,6 @@ if (cluster.isPrimary) { // Parent process with portal webserver through which c
   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'));
@@ -101,8 +115,8 @@ 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.
   }));
 
-  server.listen(port);
-  log(`Listening on ${port} and starting ${argv.nPortals} nodes on ${logicalCores} ${cpus()[0].model} logical cores.`);
+  server.listen(argv.port);
+  log(`Listening on ${argv.port} and starting ${argv.nPortals} nodes on ${logicalCores} ${cpus()[0].model} logical cores.`);
   for (let i = 0; i < argv.nPortals; i++) {
     cluster.fork();
     await delay(); // Number chosen to give an unspikey rise in packets/s.
@@ -118,8 +132,14 @@ if (cluster.isPrimary) { // Parent process with portal webserver through which c
 } else {
   process.title = 'axona-starting';
   const { P2PWebNetwork, location } = await import('../index.js');
+  const { MAJORS, geoCellCenter } = await import('@axona/protocol');
+  const excluded = argv.excludedRegionFromSeries.map(hex => parseInt(hex, 16).toString());
+  const regions = Object.keys(MAJORS).filter(r => !excluded.includes(r));
+  const index = (cluster.worker.id - 1 + argv.regionStartIndex) % regions.length;
+  const region = (argv.regionStartIndex >= 0) && regions[index];
+  const loc = region ? geoCellCenter(parseInt(region)) : location;
   const network = await P2PWebNetwork.create({
-    region: location,
+    location: loc,
     infoLogger: log,
     debugLogger: debug
   });

package/server/websocket.js

@@ -31,6 +31,7 @@ export function configureWebsocket(server) {
     ws.on('error', console.error);
     ws.on('close', () => {
       console.log('Disconnected', nodeTag);
+      delete sockets[nodeTag];
       operator.deleteSubscriber(nodeTag);
     });
   });
@@ -42,5 +43,5 @@ export function configureWebsocket(server) {
       ws.ping();
       return null;
     });
-  }, 30e3);
+  }, 20e3);
 }