Skip to content

fix: publish/getMessages ignore config.waku.pubSubTopic (hardcoded to old cluster) #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
munikes wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: publish/getMessages ignore config.waku.pubSubTopic (hardcoded to old cluster) #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/server/networking/waku-rest-api-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ export type WakuApiClientOptions = {
export enum WakuRequestMethods {
DebugInfo = '/debug/v1/info', // GET
PublishSubscription = '/relay/v1/subscriptions', // POST
PublishMessage = '/relay/v1/messages/%2Fwaku%2F2%2Frs%2F0%2F1', // POST - requires pubsub topic UTF8 URL encoded /waku/2/rs/0/1
GetMessages = '/relay/v1/messages/%2Fwaku%2F2%2Frs%2F0%2F1', // GET - requires pubsub topic UTF8 URL encoded /waku/2/rs/0/1
DeleteSubscriptions = '/relay/v1/subscriptions', // DELETE
}

const relayMessagesPath = (topic: string): string =>
`/relay/v1/messages/${encodeURIComponent(topic)}`;

const MAX_RETRIES = 4;

const checkResponseStatus = (response: any, dbg: any) => {
Expand Down Expand Up @@ -76,12 +77,10 @@ export class WakuRestApiClient {

static determineRequestType(method: string) {
switch (method) {
case WakuRequestMethods.DebugInfo:
case WakuRequestMethods.GetMessages: {
case WakuRequestMethods.DebugInfo: {
return 'GET';
}
case WakuRequestMethods.PublishSubscription:
case WakuRequestMethods.PublishMessage: {
case WakuRequestMethods.PublishSubscription: {
return 'POST';
}
case WakuRequestMethods.DeleteSubscriptions: {
Expand Down Expand Up @@ -175,18 +174,19 @@ export class WakuRestApiClient {
const { timestamp } = message;
const payload = Buffer.from(message.payload).toString('base64');
const { contentTopic } = message;
const publishPath = relayMessagesPath(topic);
if (contentTopic?.includes('fees') === true) {
// we have fee message.. dont try to resend.
const data = await this.request(
WakuRequestMethods.PublishMessage,
publishPath,
'POST',
{ payload, timestamp, version: 0, contentTopic },
MAX_RETRIES,
);
return data;
}

const data = await this.request(WakuRequestMethods.PublishMessage, 'POST', {
const data = await this.request(publishPath, 'POST', {
payload,
timestamp,
version: 0,
Expand All @@ -212,10 +212,10 @@ export class WakuRestApiClient {
* however, specifying contentTopics locally filters out uninteresting messages before return
*/
async getMessages(
topic: string, // unused
topic: string,
contentTopics: string[] = [],
): Promise<WakuRelayMessage[]> {
const data = await this.request(WakuRequestMethods.GetMessages, 'GET', []);
const data = await this.request(relayMessagesPath(topic), 'GET', []);

if (isDefined(data.error)) {
throw data.error;
Expand Down