@yz-social/civildefense.io 4.5.22 → 4.5.28

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: 40px;
+    line-height: 40px;
+    top: 0px;
+    left: 0px;
+    transition: font-size 0.8s;
+}
+.aggregate.alert-pin:before {
+    content: "";
+    width: 50px;
+    height: 50px;
+    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); }
@@ -409,9 +434,93 @@ md-menu {
     display: flex;
     align-items: center;
 }
+
+.teach {
+    position: absolute;
+    z-index: 1000;
+    background: linear-gradient(color-mix(in srgb, var(--md-sys-color-primary), white 40%), var(--md-sys-color-primary));
+    color: white;
+    padding: 10px;
+    border-radius: 12px;
+}
+.changeHashtag {
+    anchor-name: --changeHashtag;
+}
+.correspondent.avatar {
+    anchor-name: --correspondentAvatar;
+}
+.attribution > .share {
+    anchor-name: --share;
+}
+.reply-input [slot="leading-icon"] {
+    anchor-name: --attach;
+}
+md-filter-chip[label="🆘 help"], md-filter-chip[label="🆘 ayuda"] {
+    anchor-name: --topicToggle;
+}
+.leaflet-popup-content-wrapper {
+    anchor-name: --popup;
+}
+body.firstPublish.firstConversation .firstConversation .correspondent,
+body:not(.firstPublish) .firstPublish,
+body:not(.firstConversation) .firstConversation {
+    display: none;
+}
+.teach.share {
+    position-anchor: --share;
+    bottom: calc(anchor(top) + 60px);
+    left: anchor(--popup left);
+    max-width: min(45vw, 310px);
+}
+.teach.correspondent {
+    position-anchor: --correspondentAvatar;
+    bottom: calc(anchor(top) + 15px);
+    left: anchor(left);
+}
+.teach.changeHashtag {
+    position-anchor: --changeHashtag;
+    bottom: calc(anchor(top) + 60px);
+    right: anchor(--popup right);
+    width: min(45vw, 310px);
+}
+.teach.attach {
+    position-anchor: --attach;
+    top: calc(anchor(bottom) + 15px);
+    left: anchor(--popup left);
+    background: linear-gradient(var(--md-sys-color-primary), color-mix(in srgb, var(--md-sys-color-primary), white 40%));
+}
+.teach:after {
+    content: "";
+    position: absolute;
+    display: block;
+    width: 0;
+    border-style: solid;
+    border-color: var(--md-sys-color-primary) transparent;
+}
+.teach.share:after {
+    bottom: -60px;
+    left: 30px;
+    border-width: 60px 15px 0;
+}
+.teach.correspondent:after {
+    bottom: -13px;
+    left: 6px;
+    border-width: 15px 15px 0;
+}
+.teach.changeHashtag:after {
+    bottom: -60px;
+    right: 45px;
+    border-width: 60px 15px 0;
+}
+.teach.attach:after {
+    top: -15px;
+    left: 32px;
+    border-width: 0 15px 15px;
+}
 md-outlined-button {
     padding: 10px;
 }
+
 /* .attribution > div:last-child > span { */
 /*     text-wrap: nowrap; */
 /* } */

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({
-    location,
+    location: loc,
     infoLogger: log,
     debugLogger: debug
   });

package/server/location.save.json

@@ -1,4 +1,4 @@
-{
+ {
   "uswest/80": "37,-122",
   "useast/89": "40,-75",
   "uscentle/88": "35,-83",

package/server/websocket.js

@@ -5,7 +5,7 @@ import * as operator from '../public/javascripts/pubsub.js';
 const sockets = {};
 operator.setReceiver((nodeId, id, envelope) => {
   const socket = sockets[nodeId];
-  socket.send(JSON.stringify([id, envelope]));
+  socket?.send(JSON.stringify([id, envelope]));
 });
 
 function heartbeat() {
@@ -22,7 +22,7 @@ export function configureWebsocket(server) {
     ws.on('message', async message => {
       const [id, methodName, ...rest] = JSON.parse(message);
       const result = await operator[methodName](...rest);
-      ws.send(JSON.stringify([id, result]));
+      if (ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify([id, result]));
     });
 
     ws.isAlive = true;
@@ -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);
     });
   });
@@ -38,9 +39,11 @@ export function configureWebsocket(server) {
   const interval = setInterval(function ping() { // Keep-alive ping/pong on interval
     wss.clients.forEach(function each(ws) {
       if (!ws.isAlive) return ws.terminate();
-      ws.isAlive = false;
-      ws.ping();
+      if (ws.readyState == WebSocket.OPEN) {
+	ws.isAlive = false;
+	ws.ping();
+      }
       return null;
     });
-  }, 30e3);
+  }, 20e3);
 }