Merge pull request #25 from ngrok/nikolay/session-close-tunnel

Expose session close tunnel api
ngrok · Sep 8, 2023 · 9a71a31 · 9a71a31
2 parents 606b630 + 08df87d
commit 9a71a31
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 0 deletions.
diff --git a/ngrok-java-native/src/lib.rs b/ngrok-java-native/src/lib.rs
@@ -774,6 +774,17 @@ impl<'local> com_ngrok::NativeSessionRs<'local> for NativeSessionRsImpl<'local>
         }
     }
 
+    fn close_tunnel(
+        &self,
+        this: ComNgrokNativeSession<'local>,
+        tunnel_id: String,
+    ) -> Result<(), jaffi_support::Error<IOExceptionErr>> {
+        let rt = RT.get().expect("runtime not initialized");
+
+        let sess: MutexGuard<Session> = self.get_native(this);
+        rt.block_on(sess.close_tunnel(tunnel_id)).map_err(io_exc)
+    }
+
     fn close(
         &self,
         this: ComNgrokNativeSession<'local>,

diff --git a/ngrok-java-native/src/main/java/com/ngrok/NativeSession.java b/ngrok-java-native/src/main/java/com/ngrok/NativeSession.java
@@ -108,6 +108,15 @@ public String getMetadata() {
      */
     public native NativeLabeledTunnel labeledTunnel(NativeLabeledTunnel.Builder builder) throws IOException;
 
+    /**
+     * Closes the native tunnel by ID in this session.
+     * 
+     * @param tunnelId the ID of the tunnel to close
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    public native void closeTunnel(String tunnelId) throws IOException;
+
     /**
      * Closes the native session.
      *

diff --git a/ngrok-java-native/src/test/java/com/ngrok/ForwardTest.java b/ngrok-java-native/src/test/java/com/ngrok/ForwardTest.java
@@ -14,6 +14,15 @@ public void testForward() throws Exception {
         var tunnel = session.httpTunnel(new HttpTunnel.Builder().domain("ngrok-java-test.ngrok.io"));
         assertNotNull(tunnel);
 
+        new Thread(() -> {
+            try {
+                Thread.sleep(10000);
+                session.closeTunnel(tunnel.getId());
+            } catch(Throwable th) {
+                th.printStackTrace();
+            }
+        }).start();
+
         tunnel.forwardTcp("127.0.0.1:8000");
         assertTrue(true);
     }

diff --git a/ngrok-java/src/main/java/com/ngrok/Session.java b/ngrok-java/src/main/java/com/ngrok/Session.java
@@ -142,6 +142,14 @@ public default LabeledTunnel labeledTunnel() throws IOException {
      */
     public LabeledTunnel labeledTunnel(LabeledTunnel.Builder builder) throws IOException;
 
+    /**
+     * Closes a tunnel by its ID.
+     * 
+     * @param tunnelId the id of the tunnel to close
+     * @throws IOException if an I/O error occurs during tunnel close
+     */
+    public void closeTunnel(String tunnelId) throws IOException;
+
     /**
      * Configures a function which is called when the ngrok service requests that this {@link Session} stops.
      * Your application may choose to interpret this callback as a request to terminate the {@link Session} or the entire process.