simplify encoder/decoder creation logic

waku-org · Nov 22, 2023 · 821da15 · 821da15
1 parent 9d3e34b
commit 821da15
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 58 deletions.
diff --git a/packages/core/src/lib/message/version_0.ts b/packages/core/src/lib/message/version_0.ts
@@ -120,23 +120,17 @@ export class Encoder implements IEncoder {
  * messages.
  */
 export function createEncoder({
-  pubsubTopic = DefaultPubsubTopic,
+  pubsubTopicShardInfo,
   contentTopic,
   ephemeral,
   metaSetter
 }: EncoderOptions): Encoder {
-  if (typeof pubsubTopic === "string" && pubsubTopic !== DefaultPubsubTopic) {
-    throw new Error(
-      `Error: cannot use custom named pubsub topic: ${pubsubTopic}, must be ${DefaultPubsubTopic}`
-    );
-  }
-
   return new Encoder(
     contentTopic,
     ephemeral,
-    typeof pubsubTopic === "string"
-      ? pubsubTopic
-      : singleTopicShardInfoToPubsubTopic(pubsubTopic),
+    pubsubTopicShardInfo?.index
+      ? singleTopicShardInfoToPubsubTopic(pubsubTopicShardInfo)
+      : DefaultPubsubTopic,
     metaSetter
   );
 }
@@ -196,17 +190,12 @@ export class Decoder implements IDecoder<DecodedMessage> {
  */
 export function createDecoder(
   contentTopic: string,
-  pubsubTopic: SingleTopicShardInfo | PubsubTopic = DefaultPubsubTopic
+  pubsubTopicShardInfo: SingleTopicShardInfo
 ): Decoder {
-  if (typeof pubsubTopic === "string" && pubsubTopic !== DefaultPubsubTopic) {
-    throw new Error(
-      `Error: cannot use custom named pubsub topic: ${pubsubTopic}, must be ${DefaultPubsubTopic}`
-    );
-  }
   return new Decoder(
-    typeof pubsubTopic === "string"
-      ? pubsubTopic
-      : singleTopicShardInfoToPubsubTopic(pubsubTopic),
+    pubsubTopicShardInfo?.index
+      ? singleTopicShardInfoToPubsubTopic(pubsubTopicShardInfo)
+      : DefaultPubsubTopic,
     contentTopic
   );
 }
diff --git a/packages/message-encryption/src/ecies.ts b/packages/message-encryption/src/ecies.ts
@@ -98,23 +98,17 @@ export interface EncoderOptions extends BaseEncoderOptions {
  * in [26/WAKU2-PAYLOAD](https://rfc.vac.dev/spec/26/).
  */
 export function createEncoder({
-  pubsubTopic = DefaultPubsubTopic,
+  pubsubTopicShardInfo,
   contentTopic,
   publicKey,
   sigPrivKey,
   ephemeral = false,
   metaSetter
 }: EncoderOptions): Encoder {
-  if (typeof pubsubTopic === "string" && pubsubTopic !== DefaultPubsubTopic) {
-    throw new Error(
-      `Error: cannot use custom named pubsub topic: ${pubsubTopic}, must be ${DefaultPubsubTopic}`
-    );
-  }
-
   return new Encoder(
-    typeof pubsubTopic === "string"
-      ? pubsubTopic
-      : singleTopicShardInfoToPubsubTopic(pubsubTopic),
+    pubsubTopicShardInfo?.index
+      ? singleTopicShardInfoToPubsubTopic(pubsubTopicShardInfo)
+      : DefaultPubsubTopic,
     contentTopic,
     publicKey,
     sigPrivKey,
@@ -202,18 +196,12 @@ class Decoder extends DecoderV0 implements IDecoder<DecodedMessage> {
 export function createDecoder(
   contentTopic: string,
   privateKey: Uint8Array,
-  pubsubTopic: SingleTopicShardInfo | PubsubTopic = DefaultPubsubTopic
+  pubsubTopicShardInfo?: SingleTopicShardInfo
 ): Decoder {
-  if (typeof pubsubTopic === "string" && pubsubTopic !== DefaultPubsubTopic) {
-    throw new Error(
-      `Error: cannot use custom named pubsub topic: ${pubsubTopic}, must be ${DefaultPubsubTopic}`
-    );
-  }
-
   return new Decoder(
-    typeof pubsubTopic === "string"
-      ? pubsubTopic
-      : singleTopicShardInfoToPubsubTopic(pubsubTopic),
+    pubsubTopicShardInfo?.index
+      ? singleTopicShardInfoToPubsubTopic(pubsubTopicShardInfo)
+      : DefaultPubsubTopic,
     contentTopic,
     privateKey
   );

diff --git a/packages/message-encryption/src/symmetric.ts b/packages/message-encryption/src/symmetric.ts
@@ -94,22 +94,17 @@ export interface EncoderOptions extends BaseEncoderOptions {
  * in [26/WAKU2-PAYLOAD](https://rfc.vac.dev/spec/26/).
  */
 export function createEncoder({
-  pubsubTopic = DefaultPubsubTopic,
+  pubsubTopicShardInfo,
   contentTopic,
   symKey,
   sigPrivKey,
   ephemeral = false,
   metaSetter
 }: EncoderOptions): Encoder {
-  if (typeof pubsubTopic === "string" && pubsubTopic !== DefaultPubsubTopic) {
-    throw new Error(
-      `Error: cannot use custom named pubsub topic: ${pubsubTopic}, must be ${DefaultPubsubTopic}`
-    );
-  }
   return new Encoder(
-    typeof pubsubTopic === "string"
-      ? pubsubTopic
-      : singleTopicShardInfoToPubsubTopic(pubsubTopic),
+    pubsubTopicShardInfo?.index
+      ? singleTopicShardInfoToPubsubTopic(pubsubTopicShardInfo)
+      : DefaultPubsubTopic,
     contentTopic,
     symKey,
     sigPrivKey,
@@ -197,18 +192,12 @@ class Decoder extends DecoderV0 implements IDecoder<DecodedMessage> {
 export function createDecoder(
   contentTopic: string,
   symKey: Uint8Array,
-  pubsubTopic: SingleTopicShardInfo | PubsubTopic = DefaultPubsubTopic
+  pubsubTopicShardInfo?: SingleTopicShardInfo
 ): Decoder {
-  if (typeof pubsubTopic === "string" && pubsubTopic !== DefaultPubsubTopic) {
-    throw new Error(
-      `Error: cannot use custom named pubsub topic: ${pubsubTopic}, must be ${DefaultPubsubTopic}`
-    );
-  }
-
   return new Decoder(
-    typeof pubsubTopic === "string"
-      ? pubsubTopic
-      : singleTopicShardInfoToPubsubTopic(pubsubTopic),
+    pubsubTopicShardInfo?.index
+      ? singleTopicShardInfoToPubsubTopic(pubsubTopicShardInfo)
+      : DefaultPubsubTopic,
     contentTopic,
     symKey
   );