From 05dd8b7e061b5c9dc785696ddf4f55e69675d5b6 Mon Sep 17 00:00:00 2001
From: Emil Lerch <emil@lerch.org>
Date: Mon, 23 Oct 2023 13:45:17 -0700
Subject: [PATCH] support -u/--url command line args to determine target

---
 src/helpers.zig          | 21 ++++++++++++++++++---
 src/universal_lambda.zig |  1 +
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/helpers.zig b/src/helpers.zig
index 9f2a97c..89a1076 100644
--- a/src/helpers.zig
+++ b/src/helpers.zig
@@ -9,6 +9,7 @@ const Option = struct {
 };
 
 const target_option: Option = .{ .short = "t", .long = "target" };
+const url_option: Option = .{ .short = "u", .long = "url" };
 const header_option: Option = .{ .short = "h", .long = "header" };
 
 /// Finds the "target" for this request. In a web request, this is the path
@@ -32,15 +33,18 @@ fn findTargetWithoutContext(allocator: std.mem.Allocator) ![]const u8 {
     var argIterator = try std.process.argsWithAllocator(allocator);
     _ = argIterator.next();
     var is_target_option = false;
+    var is_url_option = false;
     while (argIterator.next()) |arg| {
-        if (is_target_option) {
+        if (is_target_option or is_url_option) {
             if (std.mem.startsWith(u8, arg, "-") or
                 std.mem.startsWith(u8, arg, "--"))
             {
                 // bad user input, but we're not returning errors here
                 return "/";
             }
-            return arg;
+            if (is_target_option)
+                return arg;
+            return (try std.Uri.parse(arg)).path;
         }
         if (std.mem.startsWith(u8, arg, "-" ++ target_option.short) or
             std.mem.startsWith(u8, arg, "--" ++ target_option.long))
@@ -48,9 +52,20 @@ fn findTargetWithoutContext(allocator: std.mem.Allocator) ![]const u8 {
             // We'll search for --target=blah style first
             var split = std.mem.splitSequence(u8, arg, "=");
             _ = split.next();
-            if (split.next()) |s| return s; // found it
+            const rest = split.rest();
+            if (split.next()) |_| return rest; // found it
             is_target_option = true;
         }
+        if (std.mem.startsWith(u8, arg, "-" ++ url_option.short) or
+            std.mem.startsWith(u8, arg, "--" ++ url_option.long))
+        {
+            // We'll search for --target=blah style first
+            var split = std.mem.splitSequence(u8, arg, "=");
+            _ = split.next();
+            const rest = split.rest();
+            if (split.next()) |_| return (try std.Uri.parse(rest)).path; // found it
+            is_url_option = true;
+        }
     }
     return "/";
 }
diff --git a/src/universal_lambda.zig b/src/universal_lambda.zig
index 32e2609..d390f91 100644
--- a/src/universal_lambda.zig
+++ b/src/universal_lambda.zig
@@ -12,6 +12,7 @@ pub const Response = struct {
     status: std.http.Status = .ok,
     reason: ?[]const u8 = null,
     request: struct {
+        // TODO: We will likely end up needing method here at some point...
         target: []const u8,
         headers: std.http.Headers,
     },