@yz-social/civildefense.io 4.4.1 → 4.4.3

package/index.js

@@ -1,2 +1,4 @@
 export { P2PWebNetwork } from "./public/javascripts/p2pWebNetwork.js";
 export { agentTopic, alertTopic, canonicalTag } from "./public/javascripts/versions.js";
+export { getContainingCells } from "./public/javascripts/s2.js";
+export { location } from "./server/getLocation.js";

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.4.1",
+  "version": "4.4.3",
   "keywords": [
     "map",
     "browser",

package/public/javascripts/agent.js

@@ -136,7 +136,7 @@ export class Agent {
       // Our downsampling is such that we do not need to chunkify.
       // if (type === 'avatar') {
       // 	const blob = await P2PWebNetwork.dataURL2blob(value);
-      // 	payload = await contact.chunkifyBlob({blob, region});
+      // 	payload = (await contact.chunkifyBlob({blob, region})).topic;
       // }
       return contact.publish({eventName, region, owner, payload});
     }

package/public/javascripts/map.js

@@ -486,7 +486,7 @@ export class Marker { // A wrapper around L.marker
     inputElement.querySelector('md-filled-icon-button').toggleAttribute('disabled', true);
     const contact = await networkPromise;
     if (files.length) {
-      const file = await contact.chunkifyBlob({blob: files[0], region});
+      const {topic:file} = await contact.chunkifyBlob({blob: files[0], region});
       payload = {message: payload, file};
     }
     await contact.publish({eventName: subject, region, payload}); // Publish the new reply.

package/public/javascripts/p2pWebNetwork.js

@@ -38,7 +38,7 @@ export class P2PWebNetwork {
     const network = new this();
     Object.assign(network, {infoLogger, debugLogger, identity, transport, node, peer});
     network.resetStatePromises();
-    network.info('Created network node for kernel', this.kernelVersion);
+    network.info(`Created network node for kernel ${this.kernelVersion} region 0x${this.regionCode(region.lat, region.lng).toString(16)}.`);
     await network.connect({synapseCount, timeoutMs});
     return network;
   }
@@ -159,9 +159,8 @@ export class P2PWebNetwork {
     const topic = {name: uuidv4(), region, owner};
     const buffer = await blob.arrayBuffer();
     const u8 = new Uint8Array(buffer);
-    console.log('blob', blob.size, u8.length);
-    const data = await publishChunkedBytes(this.peer, u8, {topic, signWith, mime, name, ...rest});
-    return data.topic;
+    //console.log('blob', blob.size, u8.length);
+    return await publishChunkedBytes(this.peer, u8, {topic, signWith, mime, name, ...rest});
   }
   async assembleChunkedDataURL(topic) { // Promise {bytes, mime, name, dataURL} that was chunkified to topic.
     const data = await receiveChunkedBytes(this.peer, topic, {/*, onProgress: console.log*/});
@@ -211,6 +210,9 @@ export class P2PWebNetwork {
   static regionCode(lat, lng) { // Answer containing region code.
     return geoCellId(lat, lng);
   }
+  static regionCenter(regionCode) {
+    return geoCellCenter(regionCode);
+  }
   static delay(ms, result) { // Promise result after ms milliseconds.
     return new Promise(resolve => setTimeout(resolve, ms, result));
   }
@@ -224,7 +226,7 @@ export class P2PWebNetwork {
   static canonicalizeRegion(lat, lng) {
     // Answer a {lat, lng} that is the center of a top-level Axona region containing the given {lat, lng}.
     // E.g., a precise location gets anonymized to containing top-level cell center.
-    return geoCellCenter(geoCellId(lat, lng));
+    return this.regionCenter(this.regionCode(lat, lng));
   }
   get synaptomeSize() { // Safely answer the number of connections.
     return this.node.synaptome?.size ?? 0;

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.4.1';
+const serviceVersion = '4.4.3';
 
 async function cacheFirst({request, event}) {
   // Handle request from any cache, else fetch and store it in serviceCache.

package/server/getLocation.js

@@ -6,7 +6,8 @@ import fs from 'fs/promises';
 import { resolve } from './dirname.js';
 const filename = './location.json';
 export const data = await import(filename, {with: { type: 'json' }})
-  .catch(async () => {
+  .catch(async error => {
+    console.log(error);
     const response = await fetch('https://ipinfo.io/json');
     const string = await response.text();
     console.log('Estimating location as', string);

package/server/location.json

@@ -1,12 +1,7 @@
 {
-  "ip": "99.122.55.96",
-  "hostname": "99-122-55-96.lightspeed.sntcca.sbcglobal.net",
-  "city": "Redwood City",
-  "region": "California",
-  "country": "US",
-  "loc": "37.4852,-122.2364",
-  "org": "AS7018 AT&T Enterprises, LLC",
-  "postal": "94061",
-  "timezone": "America/Los_Angeles",
-  "readme": "https://ipinfo.io/missingauth"
-}
+  "uswest/80": "37.4852,-122.2364",
+  "useast/89": "40,-75",
+  "uscentle/88": "35,-83",
+  "easteu/47": "50,17",  
+  "loc": "37.4852,-122.2364"
+}