Strip LLVM BC from resulting binaries

[ldk-java] / node-net / net.mts

diff --git a/node-net/net.mts b/node-net/net.mts
index 797bc7a7a47907920d9b00039d643cd82cd21133..c70bf8f077ab1b7c6c416b3ea957175d8e9c123d 100644 (file)
--- a/node-net/net.mts
+++ b/node-net/net.mts
@@ -8,6 +8,12 @@ export class NodeLDKNet {
        private ping_timer;
        private servers: net.Server[];
        public constructor(public peer_manager: ldk.PeerManager) {
+               // @ts-ignore
+               if (peer_manager._node_ldk_net_singleton_check != undefined) {
+                       throw "Only one NdoeLDKNet should exist per PeerManager";
+               }
+               // @ts-ignore
+               peer_manager._node_ldk_net_singleton_check = this;
                this.ping_timer = setInterval(function() {
                        peer_manager.timer_tick_occurred();
                        peer_manager.process_events();
@@ -24,6 +30,8 @@ export class NodeLDKNet {
                        server.close();
                }
                this.peer_manager.disconnect_all_peers();
+               // @ts-ignore
+               delete this.peer_manager._node_ldk_net_singleton_check;
        }
 
        /**
@@ -89,11 +97,11 @@ export class NodeLDKNet {
                return descriptor;
        }
 
-       private static v4_addr_from_ip(ip: string, port: number): ldk.NetAddress {
+       private static v4_addr_from_ip(ip: string, port: number): ldk.SocketAddress {
                const sockaddr = ip.split(".").map(parseFloat);
-               return ldk.NetAddress.constructor_ipv4(new Uint8Array(sockaddr), port);
+               return ldk.SocketAddress.constructor_tcp_ip_v4(new Uint8Array(sockaddr), port);
        }
-       private static v6_addr_from_ip(ip: string, port: number): ldk.NetAddress {
+       private static v6_addr_from_ip(ip: string, port: number): ldk.SocketAddress {
                const sockaddr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
                const halves = ip.split("::"); // either one or two elements
                const first_half = halves[0].split(":");
@@ -110,20 +118,20 @@ export class NodeLDKNet {
                                sockaddr[15 - idx*2] = v & 0xff;
                        }
                }
-               return ldk.NetAddress.constructor_ipv6(new Uint8Array(sockaddr), port);
+               return ldk.SocketAddress.constructor_tcp_ip_v6(new Uint8Array(sockaddr), port);
        }
 
-       private static get_addr_from_socket(socket: net.Socket): ldk.Option_NetAddressZ {
+       private static get_addr_from_socket(socket: net.Socket): ldk.Option_SocketAddressZ {
                const addr = socket.remoteAddress;
                if (addr === undefined)
-                       return ldk.Option_NetAddressZ.constructor_none();
+                       return ldk.Option_SocketAddressZ.constructor_none();
                if (net.isIPv4(addr)) {
-                       return ldk.Option_NetAddressZ.constructor_some(NodeLDKNet.v4_addr_from_ip(addr, socket.remotePort));
+                       return ldk.Option_SocketAddressZ.constructor_some(NodeLDKNet.v4_addr_from_ip(addr, socket.remotePort));
                }
                if (net.isIPv6(addr)) {
-                       return ldk.Option_NetAddressZ.constructor_some(NodeLDKNet.v6_addr_from_ip(addr, socket.remotePort));
+                       return ldk.Option_SocketAddressZ.constructor_some(NodeLDKNet.v6_addr_from_ip(addr, socket.remotePort));
                }
-               return ldk.Option_NetAddressZ.constructor_none();
+               return ldk.Option_SocketAddressZ.constructor_none();
        }
 
        /**