fix!: simplify subscribe/unsubscribe messages

dao-xyz · Nov 1, 2023 · 47577fe · 47577fe
1 parent 9bde1a8
commit 47577fe
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 115 deletions.
diff --git a/packages/transport/pubsub-interface/src/index.ts b/packages/transport/pubsub-interface/src/index.ts
@@ -1,5 +1,5 @@
 import { PublicSignKey } from "@peerbit/crypto";
-import { PubSubData, Subscription } from "./messages.js";
+import { PubSubData } from "./messages.js";
 import {
 	Message,
 	DataMessage,
@@ -15,10 +15,10 @@ export class SubscriptionEvent {
 	@field({ type: PublicSignKey })
 	from: PublicSignKey;
 
-	@field({ type: vec(Subscription) })
-	subscriptions: Subscription[];
+	@field({ type: vec("string") })
+	subscriptions: string[];
 
-	constructor(from: PublicSignKey, subscriptions: Subscription[]) {
+	constructor(from: PublicSignKey, subscriptions: string[]) {
 		this.from = from;
 		this.subscriptions = subscriptions;
 	}
@@ -28,10 +28,10 @@ export class UnsubcriptionEvent {
 	@field({ type: PublicSignKey })
 	from: PublicSignKey;
 
-	@field({ type: vec(Subscription) })
-	unsubscriptions: Subscription[];
+	@field({ type: vec("string") })
+	unsubscriptions: string[];
 
-	constructor(from: PublicSignKey, unsubscriptions: Subscription[]) {
+	constructor(from: PublicSignKey, unsubscriptions: string[]) {
 		this.from = from;
 		this.unsubscriptions = unsubscriptions;
 	}

diff --git a/packages/transport/pubsub-interface/src/messages.ts b/packages/transport/pubsub-interface/src/messages.ts
@@ -7,6 +7,7 @@ import {
 	deserialize,
 	option
 } from "@dao-xyz/borsh";
+import { sha256Base64Sync } from "@peerbit/crypto";
 export abstract class PubSubMessage {
 	abstract bytes(): Uint8Array | Uint8ArrayList;
 	static from(bytes: Uint8Array) {
@@ -24,6 +25,7 @@ export abstract class PubSubMessage {
 		if (first === 3) {
 			return GetSubscribers.from(bytes);
 		}
+
 		throw new Error("Unsupported");
 	}
 }
@@ -77,27 +79,17 @@ export class PubSubData extends PubSubMessage {
 	}
 }
 
-@variant(0)
-export class Subscription {
-	@field({ type: "string" })
-	topic: string;
-
-	constructor(topic: string) {
-		this.topic = topic;
-	}
-}
-
 @variant(1)
 export class Subscribe extends PubSubMessage {
-	@field({ type: vec(Subscription) })
-	subscriptions: Subscription[];
+	@field({ type: vec("string") })
+	topics: string[];
 
-	constructor(options: { subscriptions: Subscription[] }) {
+	constructor(options: { topics: string[] }) {
 		super();
-		this.subscriptions = options.subscriptions;
+		this.topics = options.topics;
 	}
 
-	_serialized: Uint8ArrayList;
+	private _serialized: Uint8ArrayList;
 
 	bytes() {
 		if (this._serialized) {
@@ -115,29 +107,16 @@ export class Subscribe extends PubSubMessage {
 		}
 		return ret;
 	}
-
-	get topics() {
-		return this.subscriptions.map((x) => x.topic);
-	}
-}
-
-@variant(0)
-export class Unsubscription {
-	@field({ type: "string" })
-	topic: string;
-	constructor(topic: string) {
-		this.topic = topic;
-	}
 }
 
 @variant(2)
 export class Unsubscribe extends PubSubMessage {
-	@field({ type: vec(Unsubscription) })
-	unsubscriptions: Unsubscription[];
+	@field({ type: vec("string") })
+	topics: string[];
 
 	constructor(options: { topics: string[] }) {
 		super();
-		this.unsubscriptions = options.topics.map((x) => new Unsubscription(x));
+		this.topics = options.topics;
 	}
 
 	_serialized: Uint8ArrayList;
@@ -159,10 +138,6 @@ export class Unsubscribe extends PubSubMessage {
 		}
 		return ret;
 	}
-
-	get topics() {
-		return this.unsubscriptions.map((x) => x.topic);
-	}
 }
 
 @variant(3)

diff --git a/packages/transport/pubsub/src/__tests__/index.test.ts b/packages/transport/pubsub/src/__tests__/index.test.ts
@@ -1041,7 +1041,7 @@ describe("pubsub", function () {
 				)
 			).toBeTrue();
 			expect(streams[2].subscriptionEvents[0].subscriptions).toHaveLength(1);
-			expect(streams[2].subscriptionEvents[0].subscriptions[0].topic).toEqual(
+			expect(streams[2].subscriptionEvents[0].subscriptions[0]).toEqual(
 				TOPIC_1
 			);
 
@@ -1072,9 +1072,9 @@ describe("pubsub", function () {
 			expect(streams[2].unsubscriptionEvents[0].unsubscriptions).toHaveLength(
 				1
 			);
-			expect(
-				streams[2].unsubscriptionEvents[0].unsubscriptions[0].topic
-			).toEqual(TOPIC_1);
+			expect(streams[2].unsubscriptionEvents[0].unsubscriptions[0]).toEqual(
+				TOPIC_1
+			);
 		});
 
 		it("can unsubscribe across peers", async () => {
@@ -1118,12 +1118,12 @@ describe("pubsub", function () {
 				)
 			).toBeTrue();
 			expect(streams[2].subscriptionEvents[0].subscriptions).toHaveLength(1);
-			expect(streams[2].subscriptionEvents[0].subscriptions[0].topic).toEqual(
+			expect(streams[2].subscriptionEvents[0].subscriptions[0]).toEqual(
 				TOPIC_1
 			);
 
 			expect(streams[2].subscriptionEvents[1].subscriptions).toHaveLength(1);
-			expect(streams[2].subscriptionEvents[1].subscriptions[0].topic).toEqual(
+			expect(streams[2].subscriptionEvents[1].subscriptions[0]).toEqual(
 				TOPIC_2
 			);
 
@@ -1162,9 +1162,9 @@ describe("pubsub", function () {
 			expect(streams[2].unsubscriptionEvents[0].unsubscriptions).toHaveLength(
 				1
 			);
-			expect(
-				streams[2].unsubscriptionEvents[0].unsubscriptions[0].topic
-			).toEqual(TOPIC_1);
+			expect(streams[2].unsubscriptionEvents[0].unsubscriptions[0]).toEqual(
+				TOPIC_1
+			);
 			streams[0].stream.unsubscribe(TOPIC_2);
 			await waitFor(
 				() =>
@@ -1200,9 +1200,9 @@ describe("pubsub", function () {
 			expect(streams[2].unsubscriptionEvents[1].unsubscriptions).toHaveLength(
 				1
 			);
-			expect(
-				streams[2].unsubscriptionEvents[1].unsubscriptions[0].topic
-			).toEqual(TOPIC_2);
+			expect(streams[2].unsubscriptionEvents[1].unsubscriptions[0]).toEqual(
+				TOPIC_2
+			);
 		});
 
 		it("can handle multiple subscriptions", async () => {