refactor: use Reader to do upload (#39)

Author: jiacai2050

.github/workflows/CI.yml

@@ -1,8 +1,6 @@
 name: CI
 
 on:
-  schedule:
-    - cron: '10 20 * * *'
   workflow_dispatch:
   pull_request:
     paths:
@@ -23,15 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        zig-version: [0.15.1]
     steps:
       - uses: actions/checkout@v4
       - uses: mlugg/setup-zig@v2
-        with:
-          version: ${{ matrix.zig-version }}
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
       - name: Run tests
         run: |
           make test
@@ -61,12 +53,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        zig-version: [0.15.1]
     steps:
       - uses: actions/checkout@v4
       - uses: mlugg/setup-zig@v2
-        with:
-          version: ${{ matrix.zig-version }}
       - name: Set Environment Variables
         run: |
           echo "ZIG_ARGS='-Dlink_vendor=false'" >> $GITHUB_ENV

.github/workflows/docs.yml

@@ -26,8 +26,6 @@ jobs:
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - uses: mlugg/setup-zig@v2
-        with:
-          version: 0.15.1
       - name: Generate docs
         run: |
           make docs

Makefile

@@ -2,8 +2,9 @@
 ARGS = ${ZIG_ARGS}
 
 run:
-	zig build run-hello -freference-trace $(ARGS)
 	zig build run-basic -freference-trace $(ARGS)
+	zig build run-post -freference-trace $(ARGS)
+	zig build run-upload -freference-trace $(ARGS)
 	zig build run-advanced -freference-trace $(ARGS)
 	zig build run-multi -freference-trace $(ARGS)
 	zig build run-header -freference-trace $(ARGS)

README.org

@@ -1,6 +1,6 @@
 #+TITLE: zig-curl
 #+DATE: 2023-09-16T23:16:15+0800
-#+LASTMOD: 2025-09-14T21:23:40+0800
+#+LASTMOD: 2025-10-02T10:13:24+0800
 #+OPTIONS: toc:nil num:nil
 #+STARTUP: content
 
@@ -18,38 +18,50 @@ The vendored libraries consist of:
 | zlib    | [[https://github.com/madler/zlib/tree/v1.3.1][1.3.1]]   |
 | mbedtls | [[https://github.com/Mbed-TLS/mbedtls/tree/v3.6.0][3.6.0]]   |
 
-- Usage
+* Usage
 #+begin_src bash :results verbatim :exports results :wrap src zig
-cat examples/hello.zig
+cat examples/basic.zig
 #+end_src
 
 #+RESULTS:
 #+begin_src zig
 const std = @import("std");
+const println = @import("util.zig").println;
+const mem = std.mem;
+const Allocator = mem.Allocator;
 const curl = @import("curl");
+const Easy = curl.Easy;
 
 pub fn main() !void {
-    var gpa = std.heap.GeneralPurposeAllocator(.{}){};
+    var gpa: std.heap.DebugAllocator(.{}) = .init;
     defer if (gpa.deinit() != .ok) @panic("leak");
     const allocator = gpa.allocator();
 
     const ca_bundle = try curl.allocCABundle(allocator);
     defer ca_bundle.deinit();
-    const easy = try curl.Easy.init(.{
+    const easy = try Easy.init(.{
         .ca_bundle = ca_bundle,
     });
     defer easy.deinit();
-
-    var writer = std.Io.Writer.Allocating.init(allocator);
-    defer writer.deinit();
-    const resp = try easy.fetch("https://httpbin.org/anything", .{
-        .writer = &writer.writer,
-    });
-
-    std.debug.print("Status code: {d}\nBody: {s}\n", .{
-        resp.status_code,
-        writer.writer.buffered(),
-    });
+    {
+        println("GET without write context");
+        const resp = try easy.fetch("https://httpbin.org/anything", .{});
+
+        std.debug.print("Status code: {d}\n", .{resp.status_code});
+    }
+
+    {
+        println("GET with fixed buffer");
+        var buffer: [1024]u8 = undefined;
+        var writer = std.Io.Writer.fixed(&buffer);
+        const resp = try easy.fetch("https://httpbin.org/anything", .{
+            .writer = &writer,
+        });
+        std.debug.print("Status code: {d}\nBody: {s}\n", .{
+            resp.status_code,
+            writer.buffered(),
+        });
+    }
 }
 #+end_src
 

build.zig

@@ -3,14 +3,15 @@ const Build = std.Build;
 const Step = Build.Step;
 const Module = Build.Module;
 const Allocator = std.mem.Allocator;
+const SanitizeC = std.zig.SanitizeC;
 
 const MODULE_NAME = "curl";
 
 pub fn build(b: *Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
     const link_vendor = b.option(bool, "link_vendor", "Whether link to vendored libcurl (default: true)") orelse true;
-    const sanitize_c: ?std.zig.SanitizeC = b.option(std.zig.SanitizeC, "sanitize_c", "Enable compiler sanitizers (default: null)") orelse null;
+    const sanitize_c = b.option(SanitizeC, "sanitize_c", "Enable compiler sanitizers (default: null)");
 
     const module = b.addModule(MODULE_NAME, .{
         .root_source_file = b.path("src/root.zig"),
@@ -35,7 +36,7 @@ pub fn build(b: *Build) !void {
         }
     }
 
-    inline for (.{ "hello", "basic", "advanced", "multi", "header" }) |name| {
+    inline for (.{ "basic", "post", "upload", "advanced", "multi", "header" }) |name| {
         try addExample(b, name, module, libcurl, target, optimize);
     }
 

build.zig.zon

@@ -1,7 +1,8 @@
 .{
     .name = .curl,
     .fingerprint = 0x3e01b4de1538b3f,
-    .version = "0.3.1",
+    .version = "0.3.2",
+    .minimum_zig_version = "0.15.1",
     .paths = .{
         "src",
         "libs",

examples/advanced.zig

@@ -113,7 +113,7 @@ fn postMultiPart(allocator: Allocator, easy: Easy) !void {
 }
 
 pub fn main() !void {
-    var gpa = std.heap.GeneralPurposeAllocator(.{}){};
+    var gpa = std.heap.DebugAllocator(.{}){};
     defer if (gpa.deinit() != .ok) @panic("leak");
     const allocator = gpa.allocator();
 

examples/basic.zig

@@ -5,9 +5,17 @@ const Allocator = mem.Allocator;
 const curl = @import("curl");
 const Easy = curl.Easy;
 
-const LOCAL_SERVER_ADDR = "http://localhost:8182";
+pub fn main() !void {
+    var gpa: std.heap.DebugAllocator(.{}) = .init;
+    defer if (gpa.deinit() != .ok) @panic("leak");
+    const allocator = gpa.allocator();
 
-fn get(easy: Easy) !void {
+    const ca_bundle = try curl.allocCABundle(allocator);
+    defer ca_bundle.deinit();
+    const easy = try Easy.init(.{
+        .ca_bundle = ca_bundle,
+    });
+    defer easy.deinit();
     {
         println("GET without write context");
         const resp = try easy.fetch("https://httpbin.org/anything", .{});
@@ -28,67 +36,3 @@ fn get(easy: Easy) !void {
         });
     }
 }
-
-fn post(allocator: Allocator, easy: Easy) !void {
-    const payload =
-        \\{"name": "John", "age": 15}
-    ;
-
-    var writer = std.Io.Writer.Allocating.init(allocator);
-    defer writer.deinit();
-    const resp = try easy.fetch(
-        "https://httpbin.org/anything",
-        .{
-            .method = .POST,
-            .body = payload,
-            .headers = &.{
-                "Content-Type: application/json",
-            },
-            .writer = &writer.writer,
-        },
-    );
-
-    std.debug.print("Status code: {d}\nBody: {s}\n", .{
-        resp.status_code,
-        writer.writer.buffered(),
-    });
-}
-
-fn upload(allocator: Allocator, easy: Easy) !void {
-    const path = "LICENSE";
-    var writer = std.Io.Writer.Allocating.init(allocator);
-
-    defer writer.deinit();
-
-    const resp = try easy.upload(LOCAL_SERVER_ADDR ++ "/anything", path, &writer.writer);
-
-    std.debug.print("Status code: {d}\nBody: {s}\n", .{
-        resp.status_code,
-        writer.writer.buffered(),
-    });
-}
-
-pub fn main() !void {
-    var gpa = std.heap.GeneralPurposeAllocator(.{}){};
-    defer if (gpa.deinit() != .ok) @panic("leak");
-    const allocator = gpa.allocator();
-
-    const ca_bundle = try curl.allocCABundle(allocator);
-    defer ca_bundle.deinit();
-    const easy = try Easy.init(.{
-        .ca_bundle = ca_bundle,
-    });
-    defer easy.deinit();
-
-    try easy.setVerbose(false);
-    println("GET demo");
-    try get(easy);
-
-    println("POST demo");
-    easy.reset();
-    try post(allocator, easy);
-
-    println("Upload demo");
-    easy.reset();
-    try upload(allocator, easy);
-}

examples/header.zig

@@ -58,7 +58,7 @@ fn iterateRedirectedHeaders(easy: Easy) !void {
 }
 
 pub fn main() !void {
-    var gpa = std.heap.GeneralPurposeAllocator(.{}){};
+    var gpa = std.heap.DebugAllocator(.{}){};
     defer if (gpa.deinit() != .ok) @panic("leak");
     const allocator = gpa.allocator();
 

examples/multi.zig

@@ -21,7 +21,7 @@ fn newEasy(writer: *Writer, url: [:0]const u8) !Easy {
 }
 
 pub fn main() !void {
-    var gpa = std.heap.GeneralPurposeAllocator(.{}){};
+    var gpa = std.heap.DebugAllocator(.{}){};
     defer if (gpa.deinit() != .ok) @panic("leak");
     const allocator = gpa.allocator();