@waku/enr 0.0.20 → 0.0.22-070b625.0

package/src/peer_id.ts

@@ -1,6 +1,6 @@
 import { unmarshalPrivateKey, unmarshalPublicKey } from "@libp2p/crypto/keys";
 import { supportedKeys } from "@libp2p/crypto/keys";
-import type { PeerId } from "@libp2p/interface/peer-id";
+import type { PeerId } from "@libp2p/interface";
 import { peerIdFromKeys } from "@libp2p/peer-id";
 
 export function createPeerIdFromPublicKey(

package/src/raw_enr.ts

@@ -10,11 +10,11 @@ import type {
   ShardInfo,
   Waku2
 } from "@waku/interfaces";
+import { decodeRelayShard } from "@waku/utils";
 import { bytesToUtf8 } from "@waku/utils/bytes";
 
 import { ERR_INVALID_ID } from "./constants.js";
 import { decodeMultiaddrs, encodeMultiaddrs } from "./multiaddrs_codec.js";
-import { decodeRelayShard } from "./relay_shard_codec.js";
 import { decodeWaku2, encodeWaku2 } from "./waku2_codec.js";
 
 export class RawEnr extends Map<ENRKey, ENRValue> {

package/dist/relay_shard_codec.d.ts

@@ -1,3 +0,0 @@
-import type { ShardInfo } from "@waku/interfaces";
-export declare const decodeRelayShard: (bytes: Uint8Array) => ShardInfo;
-export declare const encodeRelayShard: (shardInfo: ShardInfo) => Uint8Array;

package/dist/relay_shard_codec.js

@@ -1,54 +0,0 @@
-export const decodeRelayShard = (bytes) => {
-    // explicitly converting to Uint8Array to avoid Buffer
-    // https://github.com/libp2p/js-libp2p/issues/2146
-    bytes = new Uint8Array(bytes);
-    if (bytes.length < 3)
-        throw new Error("Insufficient data");
-    const view = new DataView(bytes.buffer);
-    const clusterId = view.getUint16(0);
-    const shards = [];
-    if (bytes.length === 130) {
-        // rsv format (Bit Vector)
-        for (let i = 0; i < 1024; i++) {
-            const byteIndex = Math.floor(i / 8) + 2; // Adjusted for the 2-byte cluster field
-            const bitIndex = 7 - (i % 8);
-            if (view.getUint8(byteIndex) & (1 << bitIndex)) {
-                shards.push(i);
-            }
-        }
-    }
-    else {
-        // rs format (Index List)
-        const numIndices = view.getUint8(2);
-        for (let i = 0, offset = 3; i < numIndices; i++, offset += 2) {
-            if (offset + 1 >= bytes.length)
-                throw new Error("Unexpected end of data");
-            shards.push(view.getUint16(offset));
-        }
-    }
-    return { clusterId, shards };
-};
-export const encodeRelayShard = (shardInfo) => {
-    const { clusterId, shards } = shardInfo;
-    const totalLength = shards.length >= 64 ? 130 : 3 + 2 * shards.length;
-    const buffer = new ArrayBuffer(totalLength);
-    const view = new DataView(buffer);
-    view.setUint16(0, clusterId);
-    if (shards.length >= 64) {
-        // rsv format (Bit Vector)
-        for (const index of shards) {
-            const byteIndex = Math.floor(index / 8) + 2; // Adjusted for the 2-byte cluster field
-            const bitIndex = 7 - (index % 8);
-            view.setUint8(byteIndex, view.getUint8(byteIndex) | (1 << bitIndex));
-        }
-    }
-    else {
-        // 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]);
-        }
-    }
-    return new Uint8Array(buffer);
-};
-//# sourceMappingURL=relay_shard_codec.js.map

package/dist/relay_shard_codec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"relay_shard_codec.js","sourceRoot":"","sources":["../src/relay_shard_codec.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAiB,EAAa,EAAE;IAC/D,sDAAsD;IACtD,kDAAkD;IAClD,KAAK,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;IAE9B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAE3D,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAEpC,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACzB,0BAA0B;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,wCAAwC;YACjF,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7B,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,QAAQ,CAAC,EAAE,CAAC;gBAC/C,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,yBAAyB;QACzB,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,CAAC,EAAE,CAAC;YAC7D,IAAI,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAC1E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,SAAoB,EAAc,EAAE;IACnE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;IACtE,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;IAElC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAE7B,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;QACxB,0BAA0B;QAC1B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,wCAAwC;YACrF,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YACjC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;SAAM,CAAC;QACN,yBAAyB;QACzB,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,CAAC,EAAE,CAAC;YAChE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC,CAAC"}

package/src/relay_shard_codec.ts

@@ -1,60 +0,0 @@
-import type { ShardInfo } from "@waku/interfaces";
-
-export const decodeRelayShard = (bytes: Uint8Array): ShardInfo => {
-  // explicitly converting to Uint8Array to avoid Buffer
-  // https://github.com/libp2p/js-libp2p/issues/2146
-  bytes = new Uint8Array(bytes);
-
-  if (bytes.length < 3) throw new Error("Insufficient data");
-
-  const view = new DataView(bytes.buffer);
-  const clusterId = view.getUint16(0);
-
-  const shards = [];
-
-  if (bytes.length === 130) {
-    // rsv format (Bit Vector)
-    for (let i = 0; i < 1024; i++) {
-      const byteIndex = Math.floor(i / 8) + 2; // Adjusted for the 2-byte cluster field
-      const bitIndex = 7 - (i % 8);
-      if (view.getUint8(byteIndex) & (1 << bitIndex)) {
-        shards.push(i);
-      }
-    }
-  } else {
-    // rs format (Index List)
-    const numIndices = view.getUint8(2);
-    for (let i = 0, offset = 3; i < numIndices; i++, offset += 2) {
-      if (offset + 1 >= bytes.length) throw new Error("Unexpected end of data");
-      shards.push(view.getUint16(offset));
-    }
-  }
-
-  return { clusterId, shards };
-};
-
-export const encodeRelayShard = (shardInfo: ShardInfo): Uint8Array => {
-  const { clusterId, shards } = shardInfo;
-  const totalLength = shards.length >= 64 ? 130 : 3 + 2 * shards.length;
-  const buffer = new ArrayBuffer(totalLength);
-  const view = new DataView(buffer);
-
-  view.setUint16(0, clusterId);
-
-  if (shards.length >= 64) {
-    // rsv format (Bit Vector)
-    for (const index of shards) {
-      const byteIndex = Math.floor(index / 8) + 2; // Adjusted for the 2-byte cluster field
-      const bitIndex = 7 - (index % 8);
-      view.setUint8(byteIndex, view.getUint8(byteIndex) | (1 << bitIndex));
-    }
-  } else {
-    // 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]);
-    }
-  }
-
-  return new Uint8Array(buffer);
-};