Small fixes, mostly to enable first multi-project app, p2p-chat.

Author: sbazerque

examples/chat/index.ts

@@ -1,9 +1,3 @@
-
-
-
-//$Env:NODE_PATH="dist-chat/src;dist-chat/examples/chat"
-
-
 import '@hyper-hyper-space/node-env';
 import { Identity } from 'data/identity';
 import { RSAKeyPair } from 'data/identity';
@@ -132,6 +126,9 @@ async function main() {
         console.log(m.getAuthor()?.info?.name + ': ' + m.text);
     });
 
+    room.participants?.loadAndWatchForChanges();
+    room.messages?.loadAndWatchForChanges();
+
     console.log('Type and press return to send a message!')
     console.log();
 

examples/chat/model/ChatRoom.ts

@@ -87,9 +87,6 @@ class ChatRoom extends HashedObject implements SpaceEntryPoint {
 
         this._node.broadcast(this);
         this._node.sync(this);
-
-        this.participants?.loadAndWatchForChanges();
-        this.messages?.loadAndWatchForChanges();
     }
 
     async stopSync(): Promise<void> {

scripts/beacon.bat

@@ -1,4 +1,7 @@
+setlocal
 @ECHO OFF
-setx NODE_PATH "dist-examples/src;dist-examples/examples/randomness-beacon" > NUL
+set NODE_PATH=dist-examples/src;dist-examples/examples/chat
 @ECHO ON
-node ./dist-examples/examples/randomness-beacon/index.js
+
+node ./dist-examples/examples/randomness-beacon/index.js
+endlocal

scripts/chat.bat

@@ -1,5 +1,8 @@
+setlocal
 @ECHO OFF
-setx NODE_PATH "dist-examples/src;dist-examples/examples/chat" > NUL
+set NODE_PATH=dist-examples/src;dist-examples/examples/chat
 @ECHO ON
 
-node ./dist-examples/examples/chat/index.js
+node ./dist-examples/examples/chat/index.js
+
+endlocal

src/data/containers/ImmutableReference.ts

@@ -23,7 +23,7 @@ class ImmutableReference<T extends MutableObject> extends HashedObject {
         }
 
         const ref = references.get(this.value.hash);
-        const knownClass = HashedObject.knownClasses.get(this.value.className);
+        const knownClass = HashedObject.lookupClass(this.value.className);
 
         if (ref === undefined || knownClass === undefined) {
             return false;

src/data/model.ts

@@ -6,8 +6,16 @@ export { HashReference } from './model/HashReference';
 export { HashedSet } from './model/HashedSet';
 export { HashedLiteral } from './model/HashedLiteral';
 export { Hashing, Hash } from './model/Hashing';
-export { ReversibleObject } from './model/ReversibleObject';
-export { ReversibleOp } from './model/ReversibleOp';
+
+// commenting out because these imports trigger a weird error:
+
+// export { ReversibleObject } from './model/ReversibleObject';
+// export { ReversibleOp } from './model/ReversibleOp';
+
+// TypeError: Object prototype may only be an Object or null: undefined
+// see @oleersoy's hypothesis here:
+// https://github.com/Microsoft/TypeScript/issues/28314
+
 export { UndoOp } from './model/UndoOp';
 export { Serialization } from './model/Serialization';
 export { Namespace } from './model/Namespace';

src/data/model/HashedObject.ts

@@ -36,13 +36,21 @@ const BITS_FOR_ID = 128;
  and which objects should be preloaded when loading operations that mutate
  this object and its subobjects. */
 
+
 abstract class HashedObject {
 
+    
     static knownClasses = new Map<string, new () => HashedObject>();
+
     static registerClass(name: string, clazz: new () => HashedObject) {
-        this.knownClasses.set(name, clazz);
+        HashedObject.knownClasses.set(name, clazz);
     }
 
+    static lookupClass(name: string): (new () => HashedObject) | undefined {
+        return HashedObject.knownClasses.get(name);
+    }
+
+
     private id?     : string;
     private author? : Identity;
 
@@ -511,12 +519,12 @@ abstract class HashedObject {
             throw new Error("Missing 'hashed_object' type signature while attempting to deliteralize " + literal.hash);
         }
 
-        let constr = HashedObject.knownClasses.get(value['_class']);
+        let constr = HashedObject.lookupClass(value['_class']);
 
         if (constr === undefined) {
             throw new Error("A local implementation of class '" + value['_class'] + "' is necessary to deliteralize " + literal.hash);
         } else {
-            hashedObject = new constr();
+            hashedObject = new constr() as HashedObject;
         }
 
         for (const [fieldName, fieldValue] of Object.entries(value['_fields'])) {
@@ -691,7 +699,7 @@ abstract class HashedObject {
                     something = tab;
                     let contents;
                     if (value['_type'] === 'hashed_object') {
-                        let constr = HashedObject.knownClasses.get(value['_class']);
+                        let constr = HashedObject.lookupClass(value['_class']);
                         if (constr === undefined) {
                             something = something + 'HashedObject: ';
                         } else {

src/mesh/agents/peer/PeerGroupAgent.ts

@@ -194,7 +194,7 @@ class PeerGroupAgent implements Agent {
     }
 
     ready(pod: AgentPod): void {
-        this.controlLog.debug('Started PeerControlAgent on ' + this.localPeer.endpoint + ' for id ' + this.localPeer.identityHash);
+        this.controlLog.debug('Started PeerControlAgent on local ' + this.localPeer.endpoint + ' (id=' + this.localPeer.identityHash + ') for peerGroupId ' + this.peerGroupId);
         this.pod = pod;
         this.init();
     }
@@ -351,8 +351,10 @@ class PeerGroupAgent implements Agent {
     }
 
     private async queryForOnlinePeers() {
-        if (this.connectionsPerEndpoint.size < this.params.minPeers) {
 
+        PeerGroupAgent.controlLog.trace("Consdidering querying for peers on " + this.peerGroupId);
+
+        if (this.connectionsPerEndpoint.size < this.params.minPeers) {
             let candidates = await this.peerSource.getPeers(this.params.minPeers * 5);
             let endpoints = new Array<Endpoint>();
             let fallbackEndpoints = new Array<Endpoint>();
@@ -415,6 +417,8 @@ class PeerGroupAgent implements Agent {
             }
 
 
+        } else {
+            PeerGroupAgent.controlLog.trace("Skipping querying for peers on " + this.peerGroupId);
         }
     }
 

src/mesh/agents/peer/sources/ObjectDiscoveryPeerSource.ts

@@ -61,10 +61,12 @@ class ObjectDiscoveryPeerSource implements PeerSource {
         }
 
         while (found.length < count && now < limit) {
-            
+            now = Date.now();
+
             try {
                 const reply = await this.replyStream.next(limit - now)
                 const peerInfo = await this.parseEndpoint(reply.source);
+                
                 if (peerInfo !== undefined && !unique.has(peerInfo.endpoint)) {
                     found.push(peerInfo);
                     unique.add(peerInfo.endpoint);

src/spaces/Resources.ts

@@ -65,6 +65,7 @@ class Resources {
             } else {
                 let key = RSAKeyPair.generate(1024);
                 localId = Identity.fromKeyPair({name: 'auto-generated id ' + + new RNGImpl().randomHexString(64)}, key);
+                this.config.id = localId;
             }
 
             this.config.peersForDiscovery = [(new IdentityPeer(this.config.linkupServers[0], localId.hash(), localId)).asPeerIfReady()];