X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FOnionMessageHandler.mts;fp=ts%2Fstructs%2FOnionMessageHandler.mts;h=fe1c5598f08c65e9be388662b15809f33e82749a;hb=c235b1252356e371b27ba8735595c59aaf69c2d1;hp=1cbed1b86575d8d15d0ba3395f1351433acec107;hpb=5e9de82b3a7712a41189756d9d16d946142b2ac5;p=ldk-java diff --git a/ts/structs/OnionMessageHandler.mts b/ts/structs/OnionMessageHandler.mts index 1cbed1b8..fe1c5598 100644 --- a/ts/structs/OnionMessageHandler.mts +++ b/ts/structs/OnionMessageHandler.mts @@ -2,7 +2,7 @@ import { TxOut } from '../structs/TxOut.mjs'; import { BigEndianScalar } from '../structs/BigEndianScalar.mjs'; import { AccessError } from '../enums/AccessError.mjs'; import { COption_NoneZ } from '../enums/COption_NoneZ.mjs'; -import { ChannelMonitorUpdateErr } from '../enums/ChannelMonitorUpdateErr.mjs'; +import { ChannelMonitorUpdateStatus } from '../enums/ChannelMonitorUpdateStatus.mjs'; import { ConfirmationTarget } from '../enums/ConfirmationTarget.mjs'; import { CreationError } from '../enums/CreationError.mjs'; import { Currency } from '../enums/Currency.mjs'; @@ -109,7 +109,6 @@ import { GossipTimestampFilter } from '../structs/GossipTimestampFilter.mjs'; import { MessageSendEvent } from '../structs/MessageSendEvent.mjs'; import { Result_TxOutAccessErrorZ } from '../structs/Result_TxOutAccessErrorZ.mjs'; import { TwoTuple_usizeTransactionZ } from '../structs/TwoTuple_usizeTransactionZ.mjs'; -import { Result_NoneChannelMonitorUpdateErrZ } from '../structs/Result_NoneChannelMonitorUpdateErrZ.mjs'; import { HTLCUpdate } from '../structs/HTLCUpdate.mjs'; import { MonitorEvent } from '../structs/MonitorEvent.mjs'; import { ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ } from '../structs/ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ.mjs'; @@ -165,6 +164,7 @@ import { Result_SignatureNoneZ } from '../structs/Result_SignatureNoneZ.mjs'; import { TwoTuple_SignatureSignatureZ } from '../structs/TwoTuple_SignatureSignatureZ.mjs'; import { Result_C2Tuple_SignatureSignatureZNoneZ } from '../structs/Result_C2Tuple_SignatureSignatureZNoneZ.mjs'; import { Result_SecretKeyNoneZ } from '../structs/Result_SecretKeyNoneZ.mjs'; +import { Result_PublicKeyNoneZ } from '../structs/Result_PublicKeyNoneZ.mjs'; import { Option_ScalarZ } from '../structs/Option_ScalarZ.mjs'; import { Result_SharedSecretNoneZ } from '../structs/Result_SharedSecretNoneZ.mjs'; import { ClosingTransaction } from '../structs/ClosingTransaction.mjs'; @@ -252,6 +252,9 @@ import { Balance } from '../structs/Balance.mjs'; import { TwoTuple_BlockHashChannelMonitorZ } from '../structs/TwoTuple_BlockHashChannelMonitorZ.mjs'; import { Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ } from '../structs/Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.mjs'; import { TwoTuple_PublicKeyTypeZ } from '../structs/TwoTuple_PublicKeyTypeZ.mjs'; +import { CustomOnionMessageContents, CustomOnionMessageContentsInterface } from '../structs/CustomOnionMessageContents.mjs'; +import { Option_CustomOnionMessageContentsZ } from '../structs/Option_CustomOnionMessageContentsZ.mjs'; +import { Result_COption_CustomOnionMessageContentsZDecodeErrorZ } from '../structs/Result_COption_CustomOnionMessageContentsZDecodeErrorZ.mjs'; import { Option_NetAddressZ } from '../structs/Option_NetAddressZ.mjs'; import { PeerHandleError } from '../structs/PeerHandleError.mjs'; import { Result_CVec_u8ZPeerHandleErrorZ } from '../structs/Result_CVec_u8ZPeerHandleErrorZ.mjs'; @@ -351,6 +354,7 @@ import { RoutingMessageHandler, RoutingMessageHandlerInterface } from '../struct import { CustomMessageReader, CustomMessageReaderInterface } from '../structs/CustomMessageReader.mjs'; import { CustomMessageHandler, CustomMessageHandlerInterface } from '../structs/CustomMessageHandler.mjs'; import { IgnoringMessageHandler } from '../structs/IgnoringMessageHandler.mjs'; +import { CustomOnionMessageHandler, CustomOnionMessageHandlerInterface } from '../structs/CustomOnionMessageHandler.mjs'; import { ErroringMessageHandler } from '../structs/ErroringMessageHandler.mjs'; import { MessageHandler } from '../structs/MessageHandler.mjs'; import { SocketDescriptor, SocketDescriptorInterface } from '../structs/SocketDescriptor.mjs'; @@ -390,10 +394,17 @@ export interface OnionMessageHandlerInterface { handle_onion_message(peer_node_id: Uint8Array, msg: OnionMessage): void; /**Called when a connection is established with a peer. Can be used to track which peers * advertise onion message support and are online. + * + * May return an `Err(())` if the features the peer supports are not sufficient to communicate + * with us. Implementors should be somewhat conservative about doing so, however, as other + * message handlers may still wish to communicate with this peer. */ - peer_connected(their_node_id: Uint8Array, init: Init): void; + peer_connected(their_node_id: Uint8Array, init: Init): Result_NoneNoneZ; /**Indicates a connection to the peer failed/an existing connection was lost. Allows handlers to * drop and refuse to forward onion messages to this peer. + * + * Note that in some rare cases this may be called without a corresponding + * [`Self::peer_connected`]. */ peer_disconnected(their_node_id: Uint8Array, no_connection_possible: boolean): void; /**Gets the node feature flags which this handler itself supports. All available handlers are @@ -411,7 +422,7 @@ export interface OnionMessageHandlerInterface { } class LDKOnionMessageHandlerHolder { - held: OnionMessageHandler; + held: OnionMessageHandler|null = null; } /** @@ -419,13 +430,13 @@ class LDKOnionMessageHandlerHolder { */ export class OnionMessageHandler extends CommonBase { /* @internal */ - public bindings_instance?: bindings.LDKOnionMessageHandler; + public bindings_instance: bindings.LDKOnionMessageHandler|null; /* @internal */ public instance_idx?: number; /* @internal */ - constructor(_dummy: object, ptr: bigint) { + constructor(_dummy: null, ptr: bigint) { super(ptr, bindings.OnionMessageHandler_free); this.bindings_instance = null; } @@ -439,10 +450,12 @@ export class OnionMessageHandler extends CommonBase { const msg_hu_conv: OnionMessage = new OnionMessage(null, msg); arg.handle_onion_message(peer_node_id_conv, msg_hu_conv); }, - peer_connected (their_node_id: number, init: bigint): void { + peer_connected (their_node_id: number, init: bigint): bigint { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); const init_hu_conv: Init = new Init(null, init); - arg.peer_connected(their_node_id_conv, init_hu_conv); + const ret: Result_NoneNoneZ = arg.peer_connected(their_node_id_conv, init_hu_conv); + const result: bigint = ret == null ? 0n : ret.clone_ptr(); + return result; }, peer_disconnected (their_node_id: number, no_connection_possible: boolean): void { const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id); @@ -461,13 +474,13 @@ export class OnionMessageHandler extends CommonBase { }, } as bindings.LDKOnionMessageHandler; const onionMessageProvider = OnionMessageProvider.new_impl(onionMessageProvider_impl, ); - const ptr_idx: [bigint, number] = bindings.LDKOnionMessageHandler_new(structImplementation, onionMessageProvider.instance_idx); + const ptr_idx: [bigint, number] = bindings.LDKOnionMessageHandler_new(structImplementation, onionMessageProvider.instance_idx!); impl_holder.held = new OnionMessageHandler(null, ptr_idx[0]); impl_holder.held.instance_idx = ptr_idx[1]; impl_holder.held.bindings_instance = structImplementation; impl_holder.held.ptrs_to.push(onionMessageProvider); - return impl_holder.held; + return impl_holder.held!; } /** @@ -481,15 +494,24 @@ export class OnionMessageHandler extends CommonBase { /** * Called when a connection is established with a peer. Can be used to track which peers * advertise onion message support and are online. + * + * May return an `Err(())` if the features the peer supports are not sufficient to communicate + * with us. Implementors should be somewhat conservative about doing so, however, as other + * message handlers may still wish to communicate with this peer. */ - public peer_connected(their_node_id: Uint8Array, init: Init): void { - bindings.OnionMessageHandler_peer_connected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), init == null ? 0n : CommonBase.get_ptr_of(init)); + public peer_connected(their_node_id: Uint8Array, init: Init): Result_NoneNoneZ { + const ret: bigint = bindings.OnionMessageHandler_peer_connected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), init == null ? 0n : CommonBase.get_ptr_of(init)); + const ret_hu_conv: Result_NoneNoneZ = Result_NoneNoneZ.constr_from_ptr(ret); CommonBase.add_ref_from(this, init); + return ret_hu_conv; } /** * Indicates a connection to the peer failed/an existing connection was lost. Allows handlers to * drop and refuse to forward onion messages to this peer. + * + * Note that in some rare cases this may be called without a corresponding + * [`Self::peer_connected`]. */ public peer_disconnected(their_node_id: Uint8Array, no_connection_possible: boolean): void { bindings.OnionMessageHandler_peer_disconnected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), no_connection_possible);