Wiring up SubscribeCustomMessages

ZeusLN · Mar 28, 2024 · 005837f · 005837f
1 parent 796d59b
commit 005837f
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 3 deletions.
diff --git a/backends/EmbeddedLND.ts b/backends/EmbeddedLND.ts
@@ -18,7 +18,8 @@ const {
     getNetworkInfo,
     queryRoutes,
     lookupInvoice,
-    sendCustomMessage
+    sendCustomMessage,
+    subscribeCustomMessages
 } = lndMobile.index;
 const {
     channelBalance,
@@ -52,6 +53,7 @@ export default class EmbeddedLND extends LND {
         );
     sendCustomMessage = async (data: any) =>
         await sendCustomMessage(data.peer, data.type, data.data);
+    subscribeCustomMessages = async () => await subscribeCustomMessages();
     getMyNodeInfo = async () => await getInfo();
     getNetworkInfo = async () => await getNetworkInfo();
     getInvoices = async () => await listInvoices();

diff --git a/backends/LND.ts b/backends/LND.ts
@@ -256,6 +256,8 @@ export default class LND {
             type: data.type,
             data: data.data
         });
+    subscribeCustomMessages = () =>
+        this.getRequest('/v1/custommessage/subscribe');
     getMyNodeInfo = () => this.getRequest('/v1/getinfo');
     getInvoices = (data: any) =>
         this.getRequest(

diff --git a/backends/LightningNodeConnect.ts b/backends/LightningNodeConnect.ts
@@ -128,6 +128,12 @@ export default class LightningNodeConnect {
                 data: data.data
             })
             .then((data: lnrpc.SendCustomMessageResponse) => snakeize(data));
+    subscribeCustomMessages = async () =>
+        await this.lnc.lnd.lightning
+            .subscribeCustomMessages({})
+            .then((data: lnrpc.custommessage) => {
+                snakeize(data);
+            });
     getMyNodeInfo = async () =>
         await this.lnc.lnd.lightning
             .getInfo({})

diff --git a/ios/LndMobile/Lnd.swift b/ios/LndMobile/Lnd.swift
@@ -76,6 +76,7 @@ open class Lnd {
     "InvoicesCancelInvoice": { bytes, cb in LndmobileInvoicesCancelInvoice(bytes, cb) },
     "ConnectPeer": { bytes, cb in LndmobileConnectPeer(bytes, cb) },
     "SendCustomMessage": { bytes, cb in LndmobileSendCustomMessage(bytes, cb) },
+    "SubscribeCustomMessages": { bytes, cb in LndmobileSubscribeCustomMessages(bytes, cb) },
     "DecodePayReq": { bytes, cb in LndmobileDecodePayReq(bytes, cb) },
     "DescribeGraph": { bytes, cb in LndmobileDescribeGraph(bytes, cb) },
     "GetInfo": { bytes, cb in LndmobileGetInfo(bytes, cb) },

diff --git a/lndmobile/LndMobileInjection.ts b/lndmobile/LndMobileInjection.ts
@@ -37,7 +37,8 @@ import {
     listInvoices,
     subscribeChannelGraph,
     sendKeysendPaymentV2,
-    sendCustomMessage
+    sendCustomMessage,
+    subscribeCustomMessages
 } from './index';
 import {
     channelBalance,
@@ -229,6 +230,7 @@ export interface ILndMobileInjections {
             type: number | null;
             data: Uint8Array | null;
         }) => Promise<lnrpc.SendCustomMessageResponse>;
+        subscribeCustomMessages: () => Promise<lnrpc.CustomMessage>;
     };
     channel: {
         channelBalance: () => Promise<lnrpc.ChannelBalanceResponse>;
@@ -393,7 +395,8 @@ export default {
         listInvoices,
         subscribeChannelGraph,
         sendKeysendPaymentV2,
-        sendCustomMessage
+        sendCustomMessage,
+        subscribeCustomMessages
     },
     channel: {
         channelBalance,

diff --git a/lndmobile/index.ts b/lndmobile/index.ts
@@ -181,6 +181,24 @@ export const sendCustomMessage = async (
     });
 };
 
+/**
+ * @throws
+ */
+export const subscribeCustomMessages =
+    async (): Promise<lnrpc.CustomMessage> => {
+        const response = await sendCommand<
+            lnrpc.ISubscribeCustomMessagesRequest,
+            lnrpc.SubscribeCustomMessagesRequest,
+            lnrpc.CustomMessage
+        >({
+            request: lnrpc.SubscribeCustomMessagesRequest,
+            response: lnrpc.CustomMessage,
+            method: 'SubscribeCustomMessages',
+            options: {}
+        });
+        return response;
+    };
+
 /**
  * @throws
  */

diff --git a/utils/BackendUtils.ts b/utils/BackendUtils.ts
@@ -71,6 +71,8 @@ class BackendUtils {
     sendCoins = (...args: any[]) => this.call('sendCoins', args);
     sendCustomMessage = (...args: any[]) =>
         this.call('sendCustomMessage', args);
+    subscribeCustomMessages = (...args: any[]) =>
+        this.call('subscribeCustomMessages', args);
     getMyNodeInfo = (...args: any[]) => this.call('getMyNodeInfo', args);
     getNetworkInfo = (...args: any[]) => this.call('getNetworkInfo', args);
     getInvoices = (...args: any[]) => this.call('getInvoices', args);