@yz-social/civildefense.io 4.5.21 → 4.5.22

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yz-social/civildefense.io",
   "description": "Browser app to safely share live sightings on a map.",
-  "version": "4.5.21",
+  "version": "4.5.22",
   "keywords": [
     "map",
     "browser",

package/public/javascripts/agent.js

@@ -5,6 +5,7 @@ import { agentTopic, agentPersistKey } from './versions.js';
 import { Int } from './translations.js';
 import { consume, openDisplay } from './display.js';
 import { networkPromise, resetInactivityTimer, clickTip, tooltip } from './main.js';
+import { dht } from './protocol.js';
 import { P2PWebNetwork } from './p2pWebNetwork.js';
 
 export class Agent {
@@ -292,7 +293,7 @@ export class Agent {
   static tag = null;
   static identity = null;
   // Keep user separate between dht=1 or empty (Axona) vs dht=0 or -1 (no Axona, for testing).
-  static usertagKey = `usertag${parseInt(new URL(location).searchParams.get('dht')) < 1 ? '0' : ''}`;
+  static usertagKey = `usertag${(dht <= 0) ? '0' : ''}`;
   static switchUser(tag, identity) { // Set/persist/ensure the current user, return Agent
     this.tag = tag; // Before the ensure().
     this.identity = P2PWebNetwork.currentPublishIdentity = identity;

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;

package/public/javascripts/protocol.js

@@ -3,10 +3,13 @@ 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 = 1;
+export const dht = parseInt((globalThis.process ?
+			     globalThis.process.env.DHT :
+			     new URL(globalThis.location).searchParams.get('dht')) ?? defaultDHT);
 
 if (dht < 1) {
 
@@ -93,9 +96,11 @@ 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});
+
 	  if (subHandler) return subHandler(...rest);
 	  delete inFlight[tag];
 	  return inFlightResolver?.(...rest);

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.22';
 
 const cacheList = [ // The files we need.
   "/",

package/public/stylesheets/style.css

@@ -303,9 +303,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 +343,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

@@ -119,7 +119,7 @@ if (cluster.isPrimary) { // Parent process with portal webserver through which c
   process.title = 'axona-starting';
   const { P2PWebNetwork, location } = await import('../index.js');
   const network = await P2PWebNetwork.create({
-    region: location,
+    location,
     infoLogger: log,
     debugLogger: debug
   });