Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add types DirPort, MetricsPort, NATDPort, ORPort, ExtORPort to TorListeners #427

Merged
merged 2 commits into from
Jun 3, 2024
Merged

Add types DirPort, MetricsPort, NATDPort, ORPort, ExtORPort to TorListeners #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
686f595
Make Signal.Reload a Privileged command
05nelsonm Jun 3, 2024
d797687
Update TorListeners to also handle DirPort, MetricsPort, NATDPort, OR…
05nelsonm Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/runtime-core/api/runtime-core.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3699,7 +3699,7 @@ public final class io/matthewnelson/kmp/tor/runtime/core/ctrl/TorCmd$Signal$NewN
public fun hashCode ()I
}

public final class io/matthewnelson/kmp/tor/runtime/core/ctrl/TorCmd$Signal$Reload : io/matthewnelson/kmp/tor/runtime/core/ctrl/TorCmd$Unprivileged {
public final class io/matthewnelson/kmp/tor/runtime/core/ctrl/TorCmd$Signal$Reload : io/matthewnelson/kmp/tor/runtime/core/ctrl/TorCmd$Privileged {
public static final field INSTANCE Lio/matthewnelson/kmp/tor/runtime/core/ctrl/TorCmd$Signal$Reload;
public fun equals (Ljava/lang/Object;)Z
public fun hashCode ()I
Expand Down
2 changes: 1 addition & 1 deletion ...y/runtime-core/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/core/ctrl/TorCmd.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ public sealed class TorCmd<Success: Any> private constructor(
public data object Active: Unprivileged<Reply.Success.OK>("SIGNAL")
public data object Dormant: Unprivileged<Reply.Success.OK>("SIGNAL")

public data object Reload: Unprivileged<Reply.Success.OK>("SIGNAL")
public data object Reload: Privileged<Reply.Success.OK>("SIGNAL")
public data object Shutdown: Privileged<Reply.Success.OK>("SIGNAL")
public data object Halt: Privileged<Reply.Success.OK>("SIGNAL")
}
Expand Down
28 changes: 14 additions & 14 deletions library/runtime/api/runtime.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,13 @@ public final class io/matthewnelson/kmp/tor/runtime/TorCmdJob : io/matthewnelson
}

public final class io/matthewnelson/kmp/tor/runtime/TorListeners {
public final field dir Ljava/util/Set;
public final field dns Ljava/util/Set;
public final field http Ljava/util/Set;
public final field metrics Ljava/util/Set;
public final field natd Ljava/util/Set;
public final field or Ljava/util/Set;
public final field orExt Ljava/util/Set;
public final field socks Ljava/util/Set;
public final field socksUnix Ljava/util/Set;
public final field trans Ljava/util/Set;
Expand All @@ -326,20 +331,15 @@ public final class io/matthewnelson/kmp/tor/runtime/TorListeners {
public fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
public fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
public fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
public synthetic fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Ljava/util/Set;
public final fun component2 ()Ljava/util/Set;
public final fun component3 ()Ljava/util/Set;
public final fun component4 ()Ljava/util/Set;
public final fun component5 ()Ljava/util/Set;
public final fun copy (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)Lio/matthewnelson/kmp/tor/runtime/TorListeners;
public static synthetic fun copy$default (Lio/matthewnelson/kmp/tor/runtime/TorListeners;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ILjava/lang/Object;)Lio/matthewnelson/kmp/tor/runtime/TorListeners;
public final fun copyDns (Ljava/util/Set;)Lio/matthewnelson/kmp/tor/runtime/TorListeners;
public final fun copyHttp (Ljava/util/Set;)Lio/matthewnelson/kmp/tor/runtime/TorListeners;
public final fun copySocks (Ljava/util/Set;)Lio/matthewnelson/kmp/tor/runtime/TorListeners;
public final fun copySocksUnix (Ljava/util/Set;)Lio/matthewnelson/kmp/tor/runtime/TorListeners;
public final fun copyTrans (Ljava/util/Set;)Lio/matthewnelson/kmp/tor/runtime/TorListeners;
public fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
public fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
public fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
public fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
public fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
public synthetic fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun copy (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)Lio/matthewnelson/kmp/tor/runtime/TorListeners;
public static synthetic fun copy$default (Lio/matthewnelson/kmp/tor/runtime/TorListeners;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;ILjava/lang/Object;)Lio/matthewnelson/kmp/tor/runtime/TorListeners;
public fun equals (Ljava/lang/Object;)Z
public fun hashCode ()I
public final fun isEmpty ()Z
Expand Down
40 changes: 40 additions & 0 deletions library/runtime/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/RuntimeEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,13 @@ public sealed class RuntimeEvent<Data: Any> private constructor(
* TorState[fid=6E96…6985, daemon=On{95%}, network=Enabled]
* TorState[fid=6E96…6985, daemon=On{100%}, network=Enabled]
* TorListeners[fid=6E96…6985]: [
* dir: []
* dns: []
* http: []
* metrics: []
* natd: []
* or: []
* orExt: []
* socks: [
* 127.0.0.1:35607
* ]
Expand All @@ -243,8 +248,13 @@ public sealed class RuntimeEvent<Data: Any> private constructor(
* Tor[fid=6E96…6985] IS READY
* TorState[fid=6E96…6985, daemon=On{100%}, network=Disabled]
* TorListeners[fid=6E96…6985]: [
* dir: []
* dns: []
* http: []
* metrics: []
* natd: []
* or: []
* orExt: []
* socks: []
* socksUnix: []
* trans: []
Expand Down Expand Up @@ -319,8 +329,13 @@ public sealed class RuntimeEvent<Data: Any> private constructor(
* TorState[fid=6E96…6985, daemon=On{95%}, network=Enabled]
* TorState[fid=6E96…6985, daemon=On{100%}, network=Enabled]
* TorListeners[fid=6E96…6985]: [
* dir: []
* dns: []
* http: []
* metrics: []
* natd: []
* or: []
* orExt: []
* socks: [
* 127.0.0.1:35607
* ]
Expand All @@ -330,16 +345,26 @@ public sealed class RuntimeEvent<Data: Any> private constructor(
* Tor[fid=6E96…6985] IS READY
* TorState[fid=6E96…6985, daemon=On{100%}, network=Disabled]
* TorListeners[fid=6E96…6985]: [
* dir: []
* dns: []
* http: []
* metrics: []
* natd: []
* or: []
* orExt: []
* socks: []
* socksUnix: []
* trans: []
* ]
* TorState[fid=6E96…6985, daemon=On{100%}, network=Enabled]
* TorListeners[fid=6E96…6985]: [
* dir: []
* dns: []
* http: []
* metrics: []
* natd: []
* or: []
* orExt: []
* socks: [
* 127.0.0.1:38255
* ]
Expand All @@ -348,8 +373,13 @@ public sealed class RuntimeEvent<Data: Any> private constructor(
* ]
* TorState[fid=6E96…6985, daemon=Stopping, network=Enabled]
* TorListeners[fid=6E96…6985]: [
* dir: []
* dns: []
* http: []
* metrics: []
* natd: []
* or: []
* orExt: []
* socks: []
* socksUnix: []
* trans: []
Expand Down Expand Up @@ -379,8 +409,13 @@ public sealed class RuntimeEvent<Data: Any> private constructor(
* TorState[fid=6E96…6985, daemon=On{95%}, network=Enabled]
* TorState[fid=6E96…6985, daemon=On{100%}, network=Enabled]
* TorListeners[fid=6E96…6985]: [
* dir: []
* dns: []
* http: []
* metrics: []
* natd: []
* or: []
* orExt: []
* socks: [
* 127.0.0.1:35607
* ]
Expand All @@ -390,8 +425,13 @@ public sealed class RuntimeEvent<Data: Any> private constructor(
* Tor[fid=6E96…6985] IS READY
* TorState[fid=6E96…6985, daemon=On{100%}, network=Disabled]
* TorListeners[fid=6E96…6985]: [
* dir: []
* dns: []
* http: []
* metrics: []
* natd: []
* or: []
* orExt: []
* socks: []
* socksUnix: []
* trans: []
Expand Down
Loading
Loading