From 999af75f39f37ee5f7a6cc04de34695e196082eb Mon Sep 17 00:00:00 2001 From: Jeremie Fraeys Date: Wed, 18 Feb 2026 13:36:03 -0500 Subject: [PATCH] refactor(cli): use config.getWebSocketUrl() in jupyter.zig Replace 6 instances of inline WebSocket URL construction with the config.getWebSocketUrl() helper method. This ensures consistent URL formatting and reduces code duplication. Functions updated: - startJupyter - stopJupyter - removeJupyter - listServices - packageCommands Build verified: zig build --release=fast --- cli/src/commands/jupyter.zig | 46 +++++------------------------------- 1 file changed, 6 insertions(+), 40 deletions(-) diff --git a/cli/src/commands/jupyter.zig b/cli/src/commands/jupyter.zig index 0cf6502..6b7232b 100644 --- a/cli/src/commands/jupyter.zig +++ b/cli/src/commands/jupyter.zig @@ -36,12 +36,7 @@ fn restoreJupyter(allocator: std.mem.Allocator, args: []const []const u8) !void mut_config.deinit(allocator); } - const protocol_str = if (config.worker_port == 443) "wss" else "ws"; - const url = try std.fmt.allocPrint(allocator, "{s}://{s}:{d}/ws", .{ - protocol_str, - config.worker_host, - config.worker_port, - }); + const url = try config.getWebSocketUrl(allocator); defer allocator.free(url); var client = ws.Client.connect(allocator, url, config.api_key) catch |err| { @@ -275,13 +270,7 @@ fn startJupyter(allocator: std.mem.Allocator, args: []const []const u8) !void { mut_config.deinit(allocator); } - // Build WebSocket URL - const protocol_str = if (config.worker_port == 443) "wss" else "ws"; - const url = try std.fmt.allocPrint(allocator, "{s}://{s}:{d}/ws", .{ - protocol_str, - config.worker_host, - config.worker_port, - }); + const url = try config.getWebSocketUrl(allocator); defer allocator.free(url); // Connect to WebSocket @@ -352,13 +341,7 @@ fn stopJupyter(allocator: std.mem.Allocator, args: []const []const u8) !void { mut_config.deinit(allocator); } - // Build WebSocket URL - const protocol_str = if (config.worker_port == 443) "wss" else "ws"; - const url = try std.fmt.allocPrint(allocator, "{s}://{s}:{d}/ws", .{ - protocol_str, - config.worker_host, - config.worker_port, - }); + const url = try config.getWebSocketUrl(allocator); defer allocator.free(url); // Connect to WebSocket @@ -463,13 +446,7 @@ fn removeJupyter(allocator: std.mem.Allocator, args: []const []const u8) !void { mut_config.deinit(allocator); } - // Build WebSocket URL - const protocol_str = if (config.worker_port == 443) "wss" else "ws"; - const url = try std.fmt.allocPrint(allocator, "{s}://{s}:{d}/ws", .{ - protocol_str, - config.worker_host, - config.worker_port, - }); + const url = try config.getWebSocketUrl(allocator); defer allocator.free(url); // Connect to WebSocket @@ -541,13 +518,7 @@ fn listServices(allocator: std.mem.Allocator) !void { mut_config.deinit(allocator); } - // Build WebSocket URL - const protocol_str = if (config.worker_port == 443) "wss" else "ws"; - const url = try std.fmt.allocPrint(allocator, "{s}://{s}:{d}/ws", .{ - protocol_str, - config.worker_host, - config.worker_port, - }); + const url = try config.getWebSocketUrl(allocator); defer allocator.free(url); // Connect to WebSocket @@ -788,12 +759,7 @@ fn packageCommands(args: []const []const u8) !void { mut_config.deinit(allocator); } - const protocol_str = if (config.worker_port == 443) "wss" else "ws"; - const url = try std.fmt.allocPrint(allocator, "{s}://{s}:{d}/ws", .{ - protocol_str, - config.worker_host, - config.worker_port, - }); + const url = try config.getWebSocketUrl(allocator); defer allocator.free(url); var client = ws.Client.connect(allocator, url, config.api_key) catch |err| {