Merge pull request #82 from TheBlueMatt/main

TypeScript Package cleanups and Java socket closure

Author: TheBlueMatt

genbindings.sh

@@ -222,6 +222,7 @@ else
 		rm imports.mts.part
 		tsc --types node --typeRoots .
 		cp ../$WASM_FILE liblightningjs.wasm
+		cp ../README.md README.md
 		echo Ready to publish!
 		if [ -x "$(which node)" ]; then
 			NODE_V="$(node --version)"

src/main/java/org/ldk/batteries/ChannelManagerConstructor.java

@@ -207,7 +207,7 @@ public void chain_sync_completed(EventHandler event_handler, @Nullable MultiThre
      * Interrupt the background thread, stopping the background handling of events.
      */
     public void interrupt() {
-        this.background_processor.stop();
         this.nio_peer_handler.interrupt();
+        this.background_processor.stop();
     }
 }

src/main/java/org/ldk/batteries/NioPeerHandler.java

@@ -87,7 +87,7 @@ public long send_data(byte[] data, boolean resume_read) {
 							(peer.key.interestOps() | SelectionKey.OP_READ) & (~SelectionKey.OP_WRITE)));
 					}
                     return written;
-                } catch (IOException e) {
+                } catch (IOException|CancelledKeyException ignored) {
                     // Most likely the socket is disconnected, let the background thread handle it.
                     return 0;
                 }
@@ -97,7 +97,7 @@ public long send_data(byte[] data, boolean resume_read) {
             public void disconnect_socket() {
                 try {
                     do_selector_action(() -> {
-                        peer.key.cancel();
+                        try { peer.key.cancel(); } catch (CancelledKeyException ignored) {}
                         peer.key.channel().close();
                     });
                 } catch (IOException ignored) { }
@@ -189,8 +189,8 @@ public NioPeerHandler(PeerManager manager) throws IOException {
                             if (key.isValid() && (key.interestOps() & SelectionKey.OP_WRITE) != 0 && key.isWritable()) {
                                 Result_NonePeerHandleErrorZ res = this.peer_manager.write_buffer_space_avail(peer.descriptor);
                                 if (res instanceof Result_NonePeerHandleErrorZ.Result_NonePeerHandleErrorZ_Err) {
-                                    key.channel().close();
                                     key.cancel();
+                                    key.channel().close();
                                 }
                             }
                             if (key.isValid() && (key.interestOps() & SelectionKey.OP_READ) != 0 && key.isReadable()) {
@@ -199,6 +199,7 @@ public NioPeerHandler(PeerManager manager) throws IOException {
                                 if (read == -1) {
                                     this.peer_manager.socket_disconnected(peer.descriptor);
                                     key.cancel();
+                                    key.channel().close(); // This may throw, we read -1 so the channel should already be closed, but do this to be safe
                                 } else if (read > 0) {
                                     ((Buffer)buf).flip();
                                     // This code is quite hot during initial network graph sync, so we go a ways out of
@@ -223,15 +224,15 @@ public NioPeerHandler(PeerManager manager) throws IOException {
                                             key.interestOps(key.interestOps() & (~SelectionKey.OP_READ));
                                         }
                                     } else {
-                                        key.channel().close();
                                         key.cancel();
+                                        key.channel().close();
                                     }
                                     bindings.CResult_boolPeerHandleErrorZ_free(read_result_pointer);
                                 }
                             }
                         } catch (IOException ignored) {
-                            try { key.channel().close(); } catch (IOException ignored2) { }
                             key.cancel();
+                            try { key.channel().close(); } catch (IOException ignored2) { }
                             peer_manager.socket_disconnected(peer.descriptor);
                         }
                     } catch (CancelledKeyException e) {
@@ -265,13 +266,21 @@ private void dummy_check_return_type_matches_manual_memory_code_above(Peer peer)
      */
     public void connect(byte[] their_node_id, SocketAddress remote, int timeout_ms) throws IOException {
         SocketChannel chan = SocketChannel.open();
-        chan.configureBlocking(false);
-        Selector open_selector = Selector.open();
-        chan.register(open_selector, SelectionKey.OP_CONNECT);
-        if (!chan.connect(remote)) {
-            open_selector.select(timeout_ms);
+        boolean connected;
+        try {
+            chan.configureBlocking(false);
+            Selector open_selector = Selector.open();
+            chan.register(open_selector, SelectionKey.OP_CONNECT);
+            if (!chan.connect(remote)) {
+                open_selector.select(timeout_ms);
+            }
+            connected = chan.finishConnect();
+        } catch (IOException e) {
+            try { chan.close(); } catch (IOException _e) { }
+            throw e;
         }
-        if (!chan.finishConnect()) { // Note that this may throw its own IOException if we failed for another reason
+        if (!connected) {
+            try { chan.close(); } catch (IOException _e) { }
             throw new IOException("Timed out");
         }
         Peer peer = setup_socket(chan);
@@ -323,10 +332,12 @@ public void bind_listener(SocketAddress socket_address) throws IOException {
     }
 
     /**
-     * Interrupt the background thread, stopping all peer handling. Disconnection events to the PeerHandler are not made,
-     * potentially leaving the PeerHandler in an inconsistent state.
+     * Interrupt the background thread, stopping all peer handling.
+     *
+     * After this method is called, the behavior of future calls to methods on this NioPeerHandler are undefined.
      */
     public void interrupt() {
+        this.peer_manager.disconnect_all_peers();
         shutdown = true;
         selector.wakeup();
         try {
@@ -338,6 +349,7 @@ public void interrupt() {
                 for (ServerSocketChannel chan : listening_sockets) {
                     chan.close();
                 }
+                listening_sockets.clear();
             } catch (IOException ignored) {}
         }
         Reference.reachabilityFence(this.peer_manager); // Almost certainly overkill, but no harm in it

ts/.gitignore

@@ -2,3 +2,4 @@
 *.mjs.map
 *.d.mts
 version.mts
+README.md

ts/README.md

@@ -3,6 +3,7 @@
   "version": "0.0.104.1alpha4",
   "description": "Lightning Development Kit",
   "main": "index.mjs",
+  "types": "index.d.mts",
   "type": "module",
   "directories": {
     "test": "test"

ts/package.json

@@ -10,10 +10,12 @@ for (const browserType of [chromium, firefox]) { // We'd like to test webkit, bu
 	const context = await browser.newContext();
 	const page = await context.newPage();
 	page.on('console', async msg => {
-		const values = [];
-		for (const arg of msg.args())
-			values.push(await arg.jsonValue());
-		console.log(...values);
+		try {
+			const values = [];
+			for (const arg of msg.args())
+				values.push(await arg.jsonValue());
+			console.log(...values);
+		} catch (_) { /* sometimes this gets hit if we're logging while the browser shuts down */ }
 	});
 	await page.goto('http://localhost:8000/test/index.html');
 	var ret;