TheSunIsLeaking/DorkNet
3
0
Fork 0
mirror of https://github.com/DorkSquadRR/DorkNet.git synced 2026-10-26 23:48:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): exit 0 on --help, handle parse errors cleanly

Browse Source 
--help printed usage but returned exit code 1, failing the CI smoke test. Treat --help / -h / no-args as a successful usage print (exit 0), and catch parser ArgumentExceptions so a missing value or bad --mode exits 1 with a message instead of an unhandled crash.
This commit is contained in:
Alexa
2026-06-16 00:55:41 +03:00
parent 75d187acf8
commit cfd5724859
1 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/DorkNet.ServerCli/Program.cs
+43 -34
View File
@@ -14,8 +14,15 @@ public static class Program
{ {
public static async Task<int> Main(string[] args) public static async Task<int> Main(string[] args)
{ {
// --help / -h (and a bare invocation) print usage and exit cleanly.
if (args.Length == 0 || args.Contains("--help") || args.Contains("-h"))
{
PrintHelp();
return 0;
}
var parsed = ParseArgs(args); var parsed = ParseArgs(args);
if (parsed is null) return 1; // ParseArgs already wrote --help or an error. if (parsed is null) return 1; // ParseArgs already wrote the error.
// Validate required values up front so the user sees the // Validate required values up front so the user sees the
// failure before any download / process spin-up. // failure before any download / process spin-up.
@@ -216,50 +223,52 @@ public static class Program
private static ParsedArgs? ParseArgs(string[] args) private static ParsedArgs? ParseArgs(string[] args)
{ {
if (args.Length == 0 || args.Contains("--help") || args.Contains("-h"))
{
PrintHelp();
return null;
}
string photon = "", voice = "", region = "us"; string photon = "", voice = "", region = "us";
string mode = "localtunnel", apex = "", name = "DorkNet Server"; string mode = "localtunnel", apex = "", name = "DorkNet Server";
string versionKey = "march_2020_03_10"; string versionKey = "march_2020_03_10";
string? serverDir = null; string? serverDir = null;
for (int i = 0; i < args.Length; i++) try
{ {
string Next() for (int i = 0; i < args.Length; i++)
{ {
if (i + 1 >= args.Length) string Next()
throw new ArgumentException($"missing value for {args[i]}"); {
return args[++i]; if (i + 1 >= args.Length)
throw new ArgumentException($"missing value for {args[i]}");
return args[++i];
}
switch (args[i])
{
case "--photon-id": photon = Next(); break;
case "--voice-id": voice = Next(); break;
case "--region": region = Next(); break;
case "--mode": mode = Next(); break;
case "--apex": apex = Next(); break;
case "--name": name = Next(); break;
case "--version": versionKey = Next(); break;
case "--server-dir": serverDir = Next(); break;
default:
Console.Error.WriteLine($"error: unknown arg '{args[i]}' (try --help)");
return null;
}
} }
switch (args[i])
HostingMode parsedMode = mode.ToLowerInvariant() switch
{ {
case "--photon-id": photon = Next(); break; "localtunnel" or "lt" or "internet" or "tunnel" => HostingMode.SingleOriginTunnel,
case "--voice-id": voice = Next(); break; "wildcard" or "remote" or "tunnelto" => HostingMode.RemoteWildcard,
case "--region": region = Next(); break; "lan" or "local" or "wifi" => HostingMode.LocalNetwork,
case "--mode": mode = Next(); break; _ => throw new ArgumentException($"unknown --mode '{mode}' (try localtunnel, wildcard, lan)"),
case "--apex": apex = Next(); break; };
case "--name": name = Next(); break;
case "--version": versionKey = Next(); break; return new ParsedArgs(photon, voice, region, parsedMode, apex, name, versionKey, serverDir);
case "--server-dir": serverDir = Next(); break;
default:
Console.Error.WriteLine($"error: unknown arg '{args[i]}' (try --help)");
return null;
}
} }
catch (ArgumentException ex)
HostingMode parsedMode = mode.ToLowerInvariant() switch
{ {
"localtunnel" or "lt" or "internet" or "tunnel" => HostingMode.SingleOriginTunnel, Console.Error.WriteLine($"error: {ex.Message} (try --help)");
"wildcard" or "remote" or "tunnelto" => HostingMode.RemoteWildcard, return null;
"lan" or "local" or "wifi" => HostingMode.LocalNetwork, }
_ => throw new ArgumentException($"unknown --mode '{mode}' (try localtunnel, wildcard, lan)"),
};
return new ParsedArgs(photon, voice, region, parsedMode, apex, name, versionKey, serverDir);
} }
private static void PrintHelp() private static void PrintHelp()