WIP

- added getBuckets test for distance and lastUpdated order
- resetting buckets work
- changing utility names

package.json

@@ -73,7 +73,7 @@
   "dependencies": {
     "@grpc/grpc-js": "1.3.7",
     "@matrixai/async-init": "^1.6.0",
-    "@matrixai/db": "^1.1.5",
+    "@matrixai/db": "^1.2.1",
     "@matrixai/id": "^3.3.2",
     "@matrixai/logger": "^2.1.0",
     "@matrixai/workers": "^1.2.5",
@@ -109,6 +109,7 @@
     "@types/cross-spawn": "^6.0.2",
     "@types/google-protobuf": "^3.7.4",
     "@types/jest": "^26.0.20",
+    "@types/level": "^6.0.0",
     "@types/nexpect": "^0.4.31",
     "@types/node": "^14.14.35",
     "@types/node-forge": "^0.9.7",

src/client/service/nodesGetAll.ts

@@ -29,7 +29,9 @@ function nodesGetAll({
       const response = new nodesPB.NodeBuckets();
       const metadata = await authenticate(call.metadata);
       call.sendMetadata(metadata);
-      const buckets = await nodeGraph.getAllBuckets();
+      // FIXME:
+      // const buckets = await nodeGraph.getAllBuckets();
+      const buckets: any = []
       for (const b of buckets) {
         let index;
         for (const id of Object.keys(b)) {
@@ -39,7 +41,7 @@ function nodesGetAll({
             .setPort(b[id].address.port);
           // For every node in every bucket, add it to our message
           if (!index) {
-            index = nodesUtils.calculateBucketIndex(
+            index = nodesUtils.bucketIndex(
               keyManager.getNodeId(),
               IdInternal.fromString<NodeId>(id)
             );

src/discovery/Discovery.ts

@@ -148,7 +148,7 @@ class Discovery {
       reverse: true,
     });
     for await (const o of keyStream) {
-      latestId = IdInternal.fromBuffer<DiscoveryQueueId>(o);
+      latestId = IdInternal.fromBuffer<DiscoveryQueueId>(o as Buffer);
     }
     this.discoveryQueueIdGenerator =
       discoveryUtils.createDiscoveryQueueIdGenerator(latestId);
@@ -208,8 +208,9 @@ class Discovery {
     while (true) {
       if (!(await this.queueIsEmpty())) {
         for await (const o of this.discoveryQueueDb.createReadStream()) {
-          const vertexId = IdInternal.fromBuffer(o.key) as DiscoveryQueueId;
-          const data = o.value as Buffer;
+          const kv = (o as any)
+          const vertexId = IdInternal.fromBuffer(kv.key) as DiscoveryQueueId;
+          const data = kv.value as Buffer;
           const vertex = await this.db.deserializeDecrypt<GestaltKey>(
             data,
             false,
@@ -438,7 +439,7 @@ class Discovery {
         limit: 1,
       });
       for await (const o of keyStream) {
-        nextDiscoveryQueueId = IdInternal.fromBuffer<DiscoveryQueueId>(o);
+        nextDiscoveryQueueId = IdInternal.fromBuffer<DiscoveryQueueId>(o as Buffer);
       }
       if (nextDiscoveryQueueId == null) {
         return true;

src/network/utils.ts

@@ -41,10 +41,12 @@ function isHostname(hostname: any): hostname is Hostname {
 
 /**
  * Ports must be numbers between 0 and 65535 inclusive
+ * If connect is true, then port must be a number between 1 and 65535 inclusive
  */
-function isPort(port: any): port is Port {
+function isPort(port: any, connect: boolean = false): port is Port {
   if (typeof port !== 'number') return false;
   if (port < 0 || port > 65535) return false;
+  if (connect && port === 0) return false;
   return true;
 }