@yz-social/civildefense.io 4.5.4 → 4.5.6

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.4",
+  "version": "4.5.6",
   "keywords": [
     "map",
     "browser",
@@ -9,14 +9,15 @@
   ],
   "scripts": {
     "start": "npm stop; node ./server/app.js",
-    "stop": "pkill yz.social"
+    "stop": "pkill yz.social",
+    "postinstall": "touch server/location.json; chmod a+w server/location.json"
   },
   "type": "module",
   "exports": {
     ".": "./index.js"
   },
   "dependencies": {
-    "@axona/protocol": "github:axona-net/axona-protocol#semver:^4.22.1",
+    "@axona/protocol": "github:axona-net/axona-protocol#5bf6f888cbbb5a58b9700c11582a4b6ca4c3141e",
     "cors": "^2.8.6",
     "express": "^4.22.1",
     "leaflet": "^1.9.4",

package/public/javascripts/agent.js

@@ -70,7 +70,7 @@ export class Agent {
     });
   }
   async setPublicData(data) { // Subscription to public data has fired. Update value, but do not not re-publish.
-    let {payload, subject, type, topic, ts} = data; // fixme remove topic and ts
+    let {payload, tag, type, topic, ts} = data; // fixme remove topic and ts
     // WARNING: IF we chunkify avatars, and we use since:'all', then we need lock out asynchronous
     // decoding of later timestamps, or of null payloads.
     // if (payload && (type === 'avatar')) {
@@ -79,7 +79,7 @@ export class Agent {
     //   payload = dataURL;
     // }
     this.updateValue(payload, 'public', type, false);
-    if (subject) this.publicMsgId[type] = subject;
+    if (tag) this.publicMsgId[type] = tag;
   }
   
   static agents = {}; // tag => Agent

package/public/javascripts/alert.js

@@ -12,7 +12,7 @@ import { getContainingCells, findCoverCellsByCenterAndPoint } from './s2.js';
 const { localStorage, getComputedStyle, URL, URLSearchParams, domtoimage } = globalThis;
 
 
-export function getShareableURL(subject = null, tags = Hashtags.getSubscribe()) { // Answer a url that reflects application state.
+export function getShareableURL(tag = null, tags = Hashtags.getSubscribe()) { // Answer a url that reflects application state.
   const params = new URLSearchParams(location.search);
   const zoom = map.getZoom();
   const { lat, lng } = map.getCenter();
@@ -21,7 +21,7 @@ export function getShareableURL(subject = null, tags = Hashtags.getSubscribe())
   if (lat !== null) params.set('lat', lat);
   if (lng !== null) params.set('lng', lng);
   if (zoom !== null) params.set('z', zoom);
-  if (subject !== null) params.set('sub', subject);
+  if (tag !== null) params.set('alert', tag);
   return new URL(`?${params.toString()}`, location);
 }
 export async function share(properties) {  // Invoke platform share API on properties.
@@ -61,14 +61,14 @@ export async function share(properties) {  // Invoke platform share API on prope
 
 const ttl = 24 * 60 * 60e3; // 24 hours
 let openOnReceive = null;
-export function go({lat = null, lng = null, zoom = null, subject = null}) { // Go to specified location (if any) and open marker (if any).
+export function go({lat = null, lng = null, zoom = null, alert = null}) { // Go to specified location (if any) and open marker (if any).
   if (lat !== null && lng !== null) {
     if (zoom) map.flyTo({lat, lng}, zoom);
     else map.flyTo({lat, lng});
   }
   openOnReceive = null;
-  if (subject) {
-    Alert.openPopup(subject) || (openOnReceive = subject);
+  if (alert) {
+    Alert.openPopup(alert) || (openOnReceive = alert);
   }
 }
 
@@ -77,9 +77,8 @@ let subscriptionsRegion;
 // We do not record exactly where you were looking across sessions, but we do record the containing level 9 cell.
 let lastLevel9Cell; // S2 level 9 cells average a radius of about 10km ~ 6.5 miles.
 
-let last = []; // Last published lat, lng, subject
+let last = []; // Last published lat, lng, tag
 const maxPublish = 5;
-// Publish an alert to all applicable eventNames, canceling as required. Promises subject (msgId).
 let publishing = false;
 
 export class Alert extends Conversation { // A wrapper around L.marker
@@ -116,6 +115,7 @@ export class Alert extends Conversation { // A wrapper around L.marker
     subscriptions = newKeys;
     subscriptionsRegion = region;
   }
+  // Publish an alert to all applicable eventNames, canceling as required. Promises tag (msgId).
   static async publish({lat, lng,
 			originalPosting = undefined,
 			hashtag = Hashtags.getPublish(),
@@ -129,7 +129,7 @@ export class Alert extends Conversation { // A wrapper around L.marker
     // However, the 'unpublishing' (if any) is invoked first.
     // To do this, we must hash the eventName ourselves.
     //console.log('publish', {lat, lng, hashtag, payload, cancel, subject, issuedTime, rest});
-    if (publishing) { console.log('skiping overlappying publish'); return; } // do not stack them up.
+    if (publishing) { console.log('skiping overlappying publish'); return null; } // do not stack them up.
     try {
       publishing = true;
 
@@ -154,7 +154,7 @@ export class Alert extends Conversation { // A wrapper around L.marker
 	for (const cell of oldCells) {
 	  const eventName = alertTopic(cell, hashtag);
 	  // Note: we cannot unpublish replies by others, but they expire after a while anyway.
-	  await contact.publish({eventName, region, subject, payload: null});
+	  await contact.publish({eventName, region, killTag: subject, payload: null});
 	  throttleMS && await P2PWebNetwork.delay(throttleMS);
 	}
       }
@@ -172,7 +172,7 @@ export class Alert extends Conversation { // A wrapper around L.marker
 	    lastFillIn = null;
 	  }
 	} else {
-	  await contact.publish({eventName, region, subject, payload: null});
+	  await contact.publish({eventName, region, killTag: subject, payload: null});
 	  throttleMS && await P2PWebNetwork.delay(throttleMS);
 	}
       }
@@ -191,8 +191,8 @@ export class Alert extends Conversation { // A wrapper around L.marker
   static closePopup() { // Close any open popup.
     map.closePopup();
   }
-  static openPopup(subject) { // Open the marker specified by subject.
-    const wrapper = this.getItem(subject);
+  static openPopup(alertTag) { // Open the marker specified by subject.
+    const wrapper = this.getItem(alertTag);
     wrapper?.openPopup();
   }
   async openPopup() { // Open this wrapper's popup, and resolve any waiting promise.
@@ -230,8 +230,8 @@ export class Alert extends Conversation { // A wrapper around L.marker
       wrapper.initChangeHashtag(popupAttribution);
     });
   }
-  static ensure({subject, topic, ts, issuedTime, ...rest}) { // Add marker at position with appropriate fade if not already present.
-    const alert = super.ensure({tag: subject, subject, issuedTime, ...rest}); // Does not include topic or ts. fixme: get rid of subject. fixme: why is ts different?
+  static ensure({tag, topic, ts, issuedTime, ...rest}) { // Add marker at position with appropriate fade if not already present.
+    const alert = super.ensure({tag, subject: tag, issuedTime, ...rest}); // Does not include topic or ts. fixme: get rid of subject. fixme: why is ts different?
     if (!alert) return null;
     // Regardless of initialize vs update, reset fader.
     const now = Date.now(),
@@ -242,7 +242,7 @@ export class Alert extends Conversation { // A wrapper around L.marker
     alert.destroyer = setTimeout(() => alert.destroy(), remaining);
     return alert;
   }
-  initialize({payload, hashtag, subject, agent, issuedTime, ...rest}) { // Set up the marker.
+  initialize({payload, hashtag, subject, agent, issuedTime, ...rest}) { // Set up the marker for a newly received alert.
     if (!payload) return null; // Do not cache. E.g., Received a delete event without the initial creation.
     const icon = this.constructor.makeIcon(hashtag);
     const {lat, lng, originalPosting} = payload;
@@ -261,7 +261,7 @@ export class Alert extends Conversation { // A wrapper around L.marker
     networkPromise.then(async contact => {
       contact.subscribe({eventName: subject, region, handler: data => this.ensure(data)});
     });
-    this.showNotification({tag: subject, agent, issuedTime});
+    this.showNotification({agent, issuedTime});
     return this;
   }
 
@@ -409,9 +409,9 @@ export class Alert extends Conversation { // A wrapper around L.marker
 
   // Each reply is separately published by its author, and only they can modify/unpublish it.
   async ensure(data) { // Add or update reply for this marker.
-    data.tag = data.subject; //fixme
+    data.subject = data.tag; //fixme
     const reply = super.ensure(data);
-    if (reply) {
+    if (reply) { // TODO? Move to AlertReply.initialize()?
       const {agent, issuedTime, payload} = data;
       const {file} = payload;
       if (file) {
@@ -453,17 +453,18 @@ export class Alert extends Conversation { // A wrapper around L.marker
   deleteReply(replyElement) {
     resetInactivityTimer();
     const {region} = this;
-    networkPromise.then(async contact => contact.publish({eventName: this.subject, region, subject: replyElement.dataset.subject, payload: null}));
+    networkPromise.then(async contact => contact.publish({eventName: this.subject, region, killTag: replyElement.dataset.subject, payload: null}));
   }
-  showNotification({issuedTime = this.issuedTime, body = '', agent = this.agent, tag = this.subject, lat = this.lat, lng = this.lng, hashtag = this.hashtag}) {
+  showNotification({issuedTime = this.issuedTime, body = '', agent = this.agent, alert = this.subject, lat = this.lat, lng = this.lng, hashtag = this.hashtag}) {
     // Give OS notification that comes back to here, unless act is us.
-    if (agent == Agent.tag || !notificationsAllowed()) return;
+    // All notifications on the same alert (e.g., the post and each reply) have the same tag, so OS can collapse them.
+    if (agent === Agent.tag || !notificationsAllowed()) return;
     navigator.serviceWorker.ready.then(registration => {
       const timestamp = issuedTime;
       const icon = new URL('./images/civil-defense-192.png', location.href).href;
-      const url = getShareableURL(tag, [hashtag]).href; // For opening page when it has been closed.
+      const url = getShareableURL(alert, [hashtag]).href; // For opening page when it has been closed.
       const data = {lat, lng, url};
-      const options = {icon, timestamp, tag, body, data};
+      const options = {icon, timestamp, tag: alert, body, data};
       console.log('showNotification', hashtag, options);
       registration.showNotification(hashtag, options);
     });

package/public/javascripts/conversation.js

@@ -1,5 +1,4 @@
 // TODO:
-// - clarify common lifecycle management, including existing reply to not get re-initialized
 // - In Alert, get rid of subject (just use tag)
 // - key off 'deleted' instead of payload:null, and bring handling here
 // - Bring pub/sub here, customized for SpatialConversation subclass
@@ -20,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} ${existing} to ${proposed}.`);
+      if (JSON.stringify(existing) !== JSON.stringify(proposed)) throw new Error(`Cannot update '${key}' from ${existing} to ${proposed}.`);
     }
     return this;
   }

package/public/javascripts/hashtags.js

@@ -84,7 +84,7 @@ export const Hashtags = {
     localStorage.setItem('hashtags', JSON.stringify(this.hashtags));
     if (resetSubscriptions) {
       Alert.updateSubscriptions();
-      Alert.items.forEach(wrapper => this.hashtags[wrapper.hashtag] || wrapper.destroy());
+      Object.values(Alert.items).forEach(wrapper => this.hashtags[wrapper.hashtag] || wrapper.destroy());
     }
   },
   chipset: document.body.querySelector('.watching-hashtags'), // Element containing the user's chips.

package/public/javascripts/map.js

@@ -48,7 +48,7 @@ export function updateLocation(lat, lng, zoom, positionLabel) { // initMap if ne
     const tagsArray = tags?.split(',') || [];
     tagsArray.forEach(tag => Hashtags.add(decodeURIComponent(tag)));
     Hashtags.onchange({resetSubscriptions: false}); // Too early to subscribe, but will be done during initialization.
-    go({lat: params.get('lat'), lng: params.get('lng'), zoom: params.get('z'), subject: params.get('sub')});
+    go({lat: params.get('lat'), lng: params.get('lng'), zoom: params.get('z'), alert: params.get('alert')});
     // We don't need the query parameters now. Get rid of them. They're annoying.
     const copy = new URL(location);
     const dht = copy.searchParams.get('dht');

package/public/javascripts/p2pWebNetwork.js

@@ -2,7 +2,6 @@ import { v4 as uuidv4 } from 'uuid';
 import { createNodeIdentity, createAuthorIdentity, geoCellId, geoCellCenter, WIRE_VERSION, KERNEL_VERSION } from '@axona/protocol';
 import { stringToBytes, bytesToString, publishChunkedBytes, receiveChunkedBytes } from '@axona/protocol/std';
 import { connect } from '@axona/protocol/connect.js';
-globalThis.RTCPeerConnection ||= await import('node-datachannel/polyfill').then(ndc => ndc.RTCPeerConnection);
 const { BigInt, URL, File, pica } = globalThis;
 
 /* Example:
@@ -25,6 +24,7 @@ export class P2PWebNetwork {
 		      } = {}) {
     // Promise a ready-to-use network peer.
     region = await region;
+
     const { peer, nodeIdentity, transport, status, disconnect } = await connect({
       bridge: bridgeUrl,
       location: region,
@@ -163,10 +163,10 @@ export class P2PWebNetwork {
 	const {message, deleted, msgId, signerPubkey, topic, ts} = envelope;
 	this.debug('received', {msgId, topic, ts, signerPubkey, deleted, message});
 	if (deleted) {
-	  handler({subject: msgId, payload: null, agent: signerPubkey, topic, ts}); // fixme remove topic, ts here and below.
+	  handler({tag: msgId, payload: null, agent: signerPubkey, topic, ts}); // fixme remove topic, ts here and below.
 	  return;
 	}
-	handler({...message, agent: signerPubkey, subject: msgId, topic, ts});
+	handler({...message, agent: signerPubkey, tag: msgId, topic, ts});
       };
       await this.peer.sub(topic, callback, {since});
     } else {
@@ -174,17 +174,18 @@ export class P2PWebNetwork {
     }
   }
   static currentPublishIdentity = null;
-  async publish({eventName, region, owner, signWith = this.constructor.currentPublishIdentity, issuedTime = Date.now(), subject, payload, ...rest}) {
+  async publish({eventName, region, owner, signWith = this.constructor.currentPublishIdentity, issuedTime = Date.now(), killTag, payload, ...rest}) {
     // Publish data to subscribers of eventName.
+    if (killTag && payload) throw new Error(`Specify killTag (${killTag}) or payload ($(JSON.stringify(payload)}), but not both.`);
     await this.attachment; // Get connected.
     const topic = {region, name: eventName};
     if (owner) topic.owner = owner;
     const options = {signWith};
-    this.debug('published', {topic, subject, payload, issuedTime, rest, signWith});
+    this.debug('published', {topic, killTag, payload, issuedTime, rest, signWith});
     if (payload) return await this.peer.pub(topic, {issuedTime, payload, ...rest}, options);
     // The next would not normally happen, but until since:'latest' works, we need a way to send a null payload and have the handler delete the entry.
-    if (!subject) return await this.peer.pub(topic, {issuedTime, payload, ...rest}, options);
-    return await this.peer.kill(topic, subject, options);
+    if (!killTag) return await this.peer.pub(topic, {issuedTime, payload, ...rest}, options);
+    return await this.peer.kill(topic, killTag, options);
   }
 
   host() {

package/public/javascripts/versions.js

@@ -1,6 +1,6 @@
-import pkg from '../package.json' with {type: 'json'};
+import pkg from '../../package.json' with {type: 'json'};
 export const appVersion = pkg.version; // Overall semver of app. Used in display, and for comparison by service worker.
-export const dataVersion = appVersion.split('.')[0];  // Compatability differentiator used below.
+export const dataVersion = globalThis.process?.env.EVENT_VERSION || appVersion.split('.')[0];  // Compatability differentiator used below.
 
 export function stripLeadingEmoji(string) { // Return string without any leading emoji (which might be of varying
     // length) followed by an optional emoji break character and any whitespace.

package/public/service-worker.js

@@ -208,10 +208,10 @@ self.addEventListener('notificationclick', event => {
     clients
       .matchAll({type: 'window', includeUncontrolled: true})
       .then(async clientList => {
-	console.log('notification', {title, body, data, clientList});
+	console.log('notification', {title, body, tag, data, clientList});
         for (const client of clientList) {
 	  console.log('notification click found client');
-	  return client.focus().then(() => client.postMessage({method: 'go', params: {subject: tag, ...data}}));
+	  return client.focus().then(() => client.postMessage({method: 'go', params: {alert: tag, ...data}}));
         }
 	// Client has been closed. Open one.
 	console.log('notification click opening client', data.url);