chore: prevent unchecked index access

packages/core/src/lib/filter/index.ts

@@ -110,7 +110,7 @@ class Subscription {
           async (source) => await all(source)
         );
 
-        if (!res || !res.length) {
+        if (!res || !res.length || !res[0]) {
           throw Error(
             `No response received for request ${request.requestId}: ${res}`
           );
@@ -203,7 +203,7 @@ class Subscription {
           async (source) => await all(source)
         );
 
-        if (!res || !res.length) {
+        if (!res || !res.length || !res[0]) {
           throw Error(
             `No response received for request ${request.requestId}: ${res}`
           );
@@ -246,7 +246,7 @@ class Subscription {
           async (source) => await all(source)
         );
 
-        if (!res || !res.length) {
+        if (!res || !res.length || !res[0]) {
           throw Error(
             `No response received for request ${request.requestId}: ${res}`
           );

packages/core/src/lib/filterPeers.ts

@@ -43,7 +43,10 @@ export function filterPeersByDiscovery(
   // Fill up to numPeers with remaining random peers if needed
   while (selectedPeers.length < numPeers && nonBootstrapPeers.length > 0) {
     const randomIndex = Math.floor(Math.random() * nonBootstrapPeers.length);
-    const randomPeer = nonBootstrapPeers.splice(randomIndex, 1)[0];
+    const randomPeer = nonBootstrapPeers[randomIndex];
+    if (!randomPeer) {
+      continue;
+    }
     selectedPeers.push(randomPeer);
   }
 

packages/core/src/lib/store/index.ts

@@ -237,9 +237,12 @@ class Store extends BaseProtocol implements IStore {
       );
     }
 
-    // we can be certain that there is only one pubsub topic in the query
     const pubsubTopicForQuery = uniquePubsubTopicsInQuery[0];
 
+    if (!pubsubTopicForQuery) {
+      throw Error("Cannot find a pubsub topic to use for query.");
+    }
+
     ensurePubsubTopicIsConfigured(pubsubTopicForQuery, this.pubsubTopics);
 
     // check that the pubsubTopic from the Cursor and Decoder match
@@ -287,6 +290,10 @@ class Store extends BaseProtocol implements IStore {
       })
     )[0];
 
+    if (!peer) {
+      throw Error("Failed executing query: missing a peer.");
+    }
+
     for await (const messages of paginate<T>(
       this.getStream.bind(this, peer),
       queryOpts,

packages/core/src/lib/wait_for_remote_peer.ts

@@ -88,7 +88,7 @@
 
   if (peers.length) {
     if (!metadataService) {
-      log.info(`${codec} peer found: `, peers[0].id.toString());
+      log.info(`${codec} peer found: `, peers[0]?.id.toString());
       return;
     }
 
@@ -99,7 +99,7 @@
       );
       return;
     } catch (e) {
       if ((e as any).code === "ERR_CONNECTION_BEING_CLOSED")
         log.error(
           `Connection with the peer was closed and possibly because it's on a different shard. Error: ${e}`
         );

packages/dns-discovery/src/dns.ts

@@ -8,7 +8,7 @@ import type {
 import { Logger } from "@waku/utils";
 
 import { DnsOverHttps } from "./dns_over_https.js";
-import { ENRTree } from "./enrtree.js";
+import { ENRTree, ENRTreeValues } from "./enrtree.js";
 import {
   fetchNodesUntilCapabilitiesFulfilled,
   yieldNodesUntilCapabilitiesFulfilled
@@ -41,8 +41,7 @@ export class DnsNodeDiscovery {
     enrTreeUrls: string[],
     wantedNodeCapabilityCount: Partial<NodeCapabilityCount>
   ): Promise<IEnr[]> {
-    const networkIndex = Math.floor(Math.random() * enrTreeUrls.length);
-    const { publicKey, domain } = ENRTree.parseTree(enrTreeUrls[networkIndex]);
+    const { publicKey, domain } = DnsNodeDiscovery.parseTree(enrTreeUrls);
     const context: SearchContext = {
       domain,
       publicKey,
@@ -78,8 +77,7 @@ export class DnsNodeDiscovery {
     enrTreeUrls: string[],
     wantedNodeCapabilityCount: Partial<NodeCapabilityCount>
   ): AsyncGenerator<IEnr> {
-    const networkIndex = Math.floor(Math.random() * enrTreeUrls.length);
-    const { publicKey, domain } = ENRTree.parseTree(enrTreeUrls[networkIndex]);
+    const { publicKey, domain } = DnsNodeDiscovery.parseTree(enrTreeUrls);
     const context: SearchContext = {
       domain,
       publicKey,
@@ -149,8 +147,9 @@ export class DnsNodeDiscovery {
     subdomain: string,
     context: SearchContext
   ): Promise<string> {
-    if (this._DNSTreeCache[subdomain]) {
-      return this._DNSTreeCache[subdomain];
+    const currentCache = this._DNSTreeCache[subdomain];
+    if (currentCache) {
+      return currentCache;
     }
 
     // Location is either the top level tree entry host or a subdomain of it.
@@ -161,9 +160,13 @@ export class DnsNodeDiscovery {
 
     const response = await this.dns.resolveTXT(location);
 
-    if (!response.length)
+    if (!response.length) {
       throw new Error("Received empty result array while fetching TXT record");
-    if (!response[0].length) throw new Error("Received empty TXT record");
+    }
+
+    if (!response[0]?.length) {
+      throw new Error("Received empty TXT record");
+    }
 
     // Branch entries can be an array of strings of comma delimited subdomains, with
     // some subdomain strings split across the array elements
@@ -172,6 +175,17 @@ export class DnsNodeDiscovery {
     this._DNSTreeCache[subdomain] = result;
     return result;
   }
+
+  private static parseTree(enrTreeUrls: string[]): ENRTreeValues {
+    const networkIndex = Math.floor(Math.random() * enrTreeUrls.length);
+    const enrTree = enrTreeUrls[networkIndex];
+
+    if (!enrTree) {
+      throw Error(`Failed to read ENR tree for the network: ${networkIndex}`);
+    }
+
+    return ENRTree.parseTree(enrTree);
+  }
 }
 
 function getEntryType(entry: string): string {
@@ -211,5 +225,5 @@ function selectRandomPath(branches: string[], context: SearchContext): string {
     index = Math.floor(Math.random() * branches.length);
   } while (circularRefs[index]);
 
-  return branches[index];
+  return branches[index] as string;
 }

packages/dns-discovery/src/enrtree.ts

@@ -40,6 +40,10 @@ export class ENRTree {
     // (Trailing recovery bit must be trimmed to pass `ecdsaVerify` method)
     const signedComponent = root.split(" sig")[0];
 
+    if (!signedComponent) {
+      throw Error(`Signature component is missing, got: ${signedComponent}`);
+    }
+
     const signedComponentBuffer = utf8ToBytes(signedComponent);
     const signatureBuffer = fromString(rootValues.signature, "base64url").slice(
       0,
@@ -113,11 +117,18 @@ export class ENRTree {
    * either further branch entries or ENR records.
    */
   static parseBranch(branch: string): string[] {
-    if (!branch.startsWith(this.BRANCH_PREFIX))
-      throw new Error(
+    if (!branch.startsWith(this.BRANCH_PREFIX)) {
+      throw Error(
         `ENRTree branch entry must start with '${this.BRANCH_PREFIX}'`
       );
+    }
+
+    const enrPart = branch.split(this.BRANCH_PREFIX)[1];
+
+    if (!enrPart) {
+      throw Error(`ENRTree branch does not have data`);
+    }
 
-    return branch.split(this.BRANCH_PREFIX)[1].split(",");
+    return enrPart.split(",");
   }
 }

packages/enr/src/decoder.ts

@@ -30,7 +30,7 @@ async function fromValues(values: Uint8Array[]): Promise<ENR> {
   const obj: Record<ENRKey, ENRValue> = {};
   for (let i = 0; i < kvs.length; i += 2) {
     try {
-      obj[bytesToUtf8(kvs[i])] = kvs[i + 1];
+      obj[bytesToUtf8(kvs[i] as Uint8Array)] = kvs[i + 1] as Uint8Array;
     } catch (e) {
       log.error("Failed to decode ENR key to UTF-8, skipping it", kvs[i], e);
     }

packages/enr/src/enr.ts

@@ -73,25 +73,23 @@ export class ENR extends RawEnr implements IEnr {
 
   setLocationMultiaddr(multiaddr: Multiaddr): void {
     const protoNames = multiaddr.protoNames();
-    if (
-      protoNames.length !== 2 &&
-      protoNames[1] !== "udp" &&
-      protoNames[1] !== "tcp"
-    ) {
+    const protocol = protoNames[1];
+    if (protoNames.length !== 2 && protocol !== "udp" && protocol !== "tcp") {
       throw new Error("Invalid multiaddr");
     }
+
     const tuples = multiaddr.tuples();
-    if (!tuples[0][1] || !tuples[1][1]) {
+    if (!tuples[0]?.[1] || !tuples[1]?.[1] || !protocol) {
       throw new Error("Invalid multiaddr");
     }
 
     // IPv4
     if (tuples[0][0] === 4) {
       this.set("ip", tuples[0][1]);
-      this.set(protoNames[1], tuples[1][1]);
+      this.set(protocol, tuples[1][1]);
     } else {
       this.set("ip6", tuples[0][1]);
-      this.set(protoNames[1] + "6", tuples[1][1]);
+      this.set(protocol + "6", tuples[1][1]);
     }
   }
 

packages/enr/src/raw_enr.ts

@@ -153,7 +153,7 @@ export class RawEnr extends Map<ENRKey, ENRValue> {
    */
   get waku2(): Waku2 | undefined {
     const raw = this.get("waku2");
-    if (raw) return decodeWaku2(raw[0]);
+    if (raw && raw[0]) return decodeWaku2(raw[0]);
 
     return;
   }

packages/message-encryption/src/crypto/ecies.ts

@@ -185,8 +185,12 @@ export async function decrypt(
       (macKey) => [hash.slice(0, 16), macKey]
     );
 
+    if (!encryptionKey || !macKey) {
+      throw Error("Failed to get parameters from the hash.");
+    }
+
     if (!(await hmacSha256Verify(macKey, cipherAndIv, msgMac))) {
-      throw new Error("Incorrect MAC");
+      throw Error("Incorrect MAC");
     }
 
     return aesCtrDecrypt(iv, encryptionKey, ciphertext);

packages/relay/src/constants.ts

@@ -4,7 +4,7 @@ export const minute = 60 * second;
 /**
  * RelayCodec is the libp2p identifier for the waku relay protocol
  */
-export const RelayCodecs = ["/vac/waku/relay/2.0.0"];
+export const RelayCodec = "/vac/waku/relay/2.0.0";
 
 /**
  * RelayGossipFactor affects how many peers we will emit gossip to at each heartbeat.

packages/relay/src/index.ts

@@ -32,7 +32,7 @@ import {
 import { pushOrInitMapSet } from "@waku/utils";
 import { Logger } from "@waku/utils";
 
-import { RelayCodecs } from "./constants.js";
+import { RelayCodec } from "./constants.js";
 import { messageValidator } from "./message_validator.js";
 import { TopicOnlyDecoder } from "./topic_only_message.js";
 
@@ -54,7 +54,7 @@ class Relay implements IRelay {
   public readonly pubsubTopics: Set<PubsubTopic>;
   private defaultDecoder: IDecoder<IDecodedMessage>;
 
-  public static multicodec: string = RelayCodecs[0];
+  public static multicodec: string = RelayCodec;
   public readonly gossipSub: GossipSub;
 
   /**
@@ -300,7 +300,7 @@ export function wakuGossipSub(
       fallbackToFloodsub: false
     };
     const pubsub = new GossipSub(components, init);
-    pubsub.multicodecs = RelayCodecs;
+    pubsub.multicodecs = [RelayCodec];
     return pubsub;
   };
 }

packages/tests/tests/store/multiple_pubsub.spec.ts

@@ -3,8 +3,7 @@ import type { ContentTopicInfo, IMessage, LightNode } from "@waku/interfaces";
 import { createLightNode, Protocols } from "@waku/sdk";
 import {
   contentTopicToPubsubTopic,
-  pubsubTopicToSingleShardInfo,
-  singleShardInfosToShardInfo
+  pubsubTopicToSingleShardInfo
 } from "@waku/utils";
 import { expect } from "chai";
 
@@ -29,6 +28,7 @@ import {
   sendMessagesAutosharding,
   shardInfo1,
   shardInfoBothShards,
+  singleShardInfosToShardInfo,
   startAndConnectLightNode,
   totalMsgs
 } from "./utils.js";

packages/tests/tests/store/utils.ts

@@ -148,3 +148,23 @@ export const adjustDate = (baseDate: Date, adjustMs: number): Date => {
   adjusted.setTime(adjusted.getTime() + adjustMs);
   return adjusted;
 };
+
+export const singleShardInfosToShardInfo = (
+  singleShardInfos: SingleShardInfo[]
+): ShardInfo => {
+  if (singleShardInfos.length === 0) throw new Error("Invalid shard");
+
+  const clusterIds = singleShardInfos.map((shardInfo) => shardInfo.clusterId);
+  if (new Set(clusterIds).size !== 1) {
+    throw new Error("Passed shard infos have different clusterIds");
+  }
+
+  const shards = singleShardInfos
+    .map((shardInfo) => shardInfo.shard)
+    .filter((shard): shard is number => shard !== undefined);
+
+  return {
+    clusterId: singleShardInfos[0].clusterId,
+    shards
+  };
+};

packages/tests/tsconfig.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "outDir": "dist/",
     "rootDir": "src",
-    "tsBuildInfoFile": "dist/.tsbuildinfo"
+    "tsBuildInfoFile": "dist/.tsbuildinfo",
+    "noUncheckedIndexedAccess": false,
   },
   "include": ["src", "src/run-tests.js"],
   "exclude": ["src/**/*.spec.ts", "src/test_utils"]

packages/utils/src/common/random_subset.ts

@@ -22,8 +22,8 @@ function shuffle<T>(arr: T[]): T[] {
 
   for (let i = 0; i < arr.length; i++) {
     const j = randInt();
-    const tmp = arr[i];
-    arr[i] = arr[j];
+    const tmp = arr[i] as T;
+    arr[i] = arr[j] as T;
     arr[j] = tmp;
   }
   return arr;

packages/utils/src/common/relay_shard_codec.ts

@@ -52,7 +52,7 @@ export const encodeRelayShard = (shardInfo: ShardInfo): Uint8Array => {
     // rs format (Index List)
     view.setUint8(2, shards.length);
     for (let i = 0, offset = 3; i < shards.length; i++, offset += 2) {
-      view.setUint16(offset, shards[i]);
+      view.setUint16(offset, shards[i] as number);
     }
   }