Moved stuff
This commit is contained in:
parent
1e8283f0c9
commit
c19af600f2
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -0,0 +1,2 @@
|
||||||
|
zig-cache/
|
||||||
|
zig-out/
|
118
build.zig
118
build.zig
|
@ -2,43 +2,25 @@ const std = @import("std");
|
||||||
|
|
||||||
pub fn build(b: *std.Build) !void {
|
pub fn build(b: *std.Build) !void {
|
||||||
const target = b.standardTargetOptions(.{});
|
const target = b.standardTargetOptions(.{});
|
||||||
|
|
||||||
// Standard optimization options allow the person running `zig build` to select
|
|
||||||
// between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not
|
|
||||||
// set a preferred release mode, allowing the user to decide how to optimize.
|
|
||||||
const optimize = b.standardOptimizeOption(.{});
|
const optimize = b.standardOptimizeOption(.{});
|
||||||
|
|
||||||
const exe = b.addExecutable(.{
|
const exe = b.addExecutable(.{
|
||||||
.name = "zx",
|
.name = "zx",
|
||||||
// In this case the main source file is merely a path, however, in more
|
|
||||||
// complicated build scripts, this could be a generated file.
|
|
||||||
.root_source_file = .{ .path = "src/main.zig" },
|
.root_source_file = .{ .path = "src/main.zig" },
|
||||||
.target = target,
|
.target = target,
|
||||||
.optimize = optimize,
|
.optimize = optimize,
|
||||||
});
|
});
|
||||||
|
|
||||||
// This declares intent for the library to be installed into the standard
|
|
||||||
// location when the user invokes the "install" step (the default step when
|
|
||||||
// running `zig build`).
|
|
||||||
b.installArtifact(exe);
|
b.installArtifact(exe);
|
||||||
|
|
||||||
const run_cmd = b.addRunArtifact(exe);
|
const run_cmd = b.addRunArtifact(exe);
|
||||||
|
|
||||||
// By making the run step depend on the install step, it will be run from the
|
|
||||||
// installation directory rather than directly from within the cache directory.
|
|
||||||
// This is not necessary, however, if the application depends on other installed
|
|
||||||
// files, this ensures they will be present and in the expected location.
|
|
||||||
run_cmd.step.dependOn(b.getInstallStep());
|
run_cmd.step.dependOn(b.getInstallStep());
|
||||||
|
|
||||||
// This allows the user to pass arguments to the application in the build
|
|
||||||
// command itself, like this: `zig build run -- arg1 arg2 etc`
|
|
||||||
if (b.args) |args| {
|
if (b.args) |args| {
|
||||||
run_cmd.addArgs(args);
|
run_cmd.addArgs(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
// This creates a build step. It will be visible in the `zig build --help` menu,
|
|
||||||
// and can be selected like this: `zig build run`
|
|
||||||
// This will evaluate the `run` step rather than the default, which is "install".
|
|
||||||
const run_step = b.step("run", "Run the app");
|
const run_step = b.step("run", "Run the app");
|
||||||
run_step.dependOn(&run_cmd.step);
|
run_step.dependOn(&run_cmd.step);
|
||||||
|
|
||||||
|
@ -52,54 +34,66 @@ pub fn build(b: *std.Build) !void {
|
||||||
|
|
||||||
const run_main_tests = b.addRunArtifact(main_tests);
|
const run_main_tests = b.addRunArtifact(main_tests);
|
||||||
|
|
||||||
// This creates a build step. It will be visible in the `zig build --help` menu,
|
|
||||||
// and can be selected like this: `zig build test`
|
|
||||||
// This will evaluate the `test` step rather than the default, which is "install".
|
|
||||||
const test_step = b.step("test", "Run library tests");
|
const test_step = b.step("test", "Run library tests");
|
||||||
test_step.dependOn(&run_main_tests.step);
|
test_step.dependOn(&run_main_tests.step);
|
||||||
|
|
||||||
// Setup comptime parsing for /lib files
|
// // Setup comptime parsing for /lib files
|
||||||
var markup_files = std.ArrayList([]const u8).init(b.allocator);
|
// var markup_files = std.ArrayList([]const u8).init(b.allocator);
|
||||||
var zig_files = std.ArrayList([]const u8).init(b.allocator);
|
// var zig_files = std.ArrayList([]const u8).init(b.allocator);
|
||||||
defer markup_files.deinit();
|
// defer markup_files.deinit();
|
||||||
defer zig_files.deinit();
|
// defer zig_files.deinit();
|
||||||
|
|
||||||
var options = b.addOptions();
|
// var options = b.addOptions();
|
||||||
|
|
||||||
// Add all files names in the src folder to `files`
|
// // Add all files names in the src folder to `files`
|
||||||
var dir = try std.fs.cwd().openIterableDir("lib", .{});
|
// var iter_dir = try std.fs.cwd().openIterableDir("lib", .{});
|
||||||
var lib_walker = try dir.walk(b.allocator);
|
// var src_dir = try std.fs.cwd().openDir("src", .{});
|
||||||
var walking = true;
|
// var lib_walker = try iter_dir.walk(b.allocator);
|
||||||
while (walking) blk: {
|
// var walking = true;
|
||||||
var file = lib_walker.next() catch {
|
// while (walking) blk: {
|
||||||
walking = false;
|
// var file = lib_walker.next() catch {
|
||||||
break :blk;
|
// walking = false;
|
||||||
};
|
// break :blk;
|
||||||
if (file == null) {
|
// };
|
||||||
walking = false;
|
// if (file == null) {
|
||||||
break :blk;
|
// walking = false;
|
||||||
}
|
// break :blk;
|
||||||
if (file.?.kind == .file) {
|
// }
|
||||||
const path = file.?.path;
|
// if (file.?.kind == .file) {
|
||||||
var split_iter = std.mem.splitBackwardsAny(u8, path, ".");
|
// const path = file.?.path;
|
||||||
var extension = split_iter.first();
|
// var split_iter = std.mem.splitBackwardsAny(u8, path, ".");
|
||||||
if (std.mem.eql(u8, extension, "zig")) {
|
// var extension = split_iter.first();
|
||||||
std.debug.print("Adding zig file {s}...\n", .{path});
|
// if (std.mem.eql(u8, extension, "zig")) {
|
||||||
try zig_files.append(b.dupe(path));
|
// std.debug.print("Adding zig file {s}...\n", .{path});
|
||||||
}
|
// try zig_files.append(b.dupe(path));
|
||||||
else if (std.mem.eql(u8, extension, "html")) {
|
// var arr: [50]u8 = undefined;
|
||||||
std.debug.print("Adding markup file {s}...\n", .{path});
|
// var buf = arr[0..];
|
||||||
try markup_files.append(b.dupe(path));
|
// var z_file_path = try std.fmt.bufPrint(buf, "lib/{s}", .{path});
|
||||||
} else {
|
// var z_file = try std.fs.cwd().openFile(z_file_path, .{});
|
||||||
std.debug.print("Unrecognized file extension {s}\t{s}\n", .{extension, path});
|
// const zig_contents = try z_file.readToEndAlloc(b.allocator, 64000);
|
||||||
}
|
// const index = std.mem.indexOf(u8, zig_contents, "pub fn post");
|
||||||
}
|
// if (index) |i| {
|
||||||
// std.debug.print("Got entry in `versions:` base: {s}, path: {s}, kind: {any}\n", .{ ver.?.basename, ver.?.path, ver.?.kind });
|
// std.debug.print("Found post endpoint in {s}\n", .{z_file_path});
|
||||||
}
|
// var routes_file = try src_dir.createFile("routes.zig", .{});
|
||||||
|
// _ = try routes_file.write(zig_contents[i..]);
|
||||||
|
// std.debug.print("Wrote {s}... to routes.zig\n", .{zig_contents[0..10]});
|
||||||
|
// }
|
||||||
|
|
||||||
// Add the file names as an option to the exe, making it available
|
// }
|
||||||
// as a string array at comptime in main.zig
|
// else if (std.mem.eql(u8, extension, "html")) {
|
||||||
options.addOption([]const []const u8, "zig_files", zig_files.items);
|
// std.debug.print("Adding markup file {s}...\n", .{path});
|
||||||
options.addOption([]const []const u8, "markup_files", markup_files.items);
|
// try markup_files.append(b.dupe(path));
|
||||||
exe.addOptions("options", options);
|
// } else {
|
||||||
|
// std.debug.print("Unrecognized file extension {s}\t{s}\n", .{extension, path});
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// // std.debug.print("Got entry in `versions:` base: {s}, path: {s}, kind: {any}\n", .{ ver.?.basename, ver.?.path, ver.?.kind });
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
// // Add the file names as an option to the exe, making it available
|
||||||
|
// // as a string array at comptime in main.zig
|
||||||
|
// options.addOption([]const []const u8, "zig_files", zig_files.items);
|
||||||
|
// options.addOption([]const []const u8, "markup_files", markup_files.items);
|
||||||
|
// exe.addOptions("options", options);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
const std = @import("std");
|
const std = @import("std");
|
||||||
|
|
||||||
pub fn get() i32 {
|
pub fn post() i32 {
|
||||||
std.debug.print("Running route get!\n", .{});
|
std.debug.print("Running route get!\n", .{});
|
||||||
return 13;
|
return 13;
|
||||||
}
|
}
|
101
src/main.zig
101
src/main.zig
|
@ -1,12 +1,97 @@
|
||||||
const std = @import("std");
|
const std = @import("std");
|
||||||
const options = @import("options");
|
const http = std.http;
|
||||||
|
const log = std.log.scoped(.server);
|
||||||
|
|
||||||
pub fn main() void {
|
const server_addr = "127.0.0.1";
|
||||||
std.debug.print("Ello there\n", .{});
|
const server_port = 8000;
|
||||||
comptime {
|
|
||||||
const route = @import(options.zig_files[0]);
|
// Run the server and handle incoming requests.
|
||||||
route.get();
|
fn runServer(server: *http.Server, allocator: std.mem.Allocator) !void {
|
||||||
// @compileLog("Got option zig file " ++ options.zig_files[0] ++ "\n");
|
outer: while (true) {
|
||||||
|
// Accept incoming connection.
|
||||||
|
var response = try server.accept(.{
|
||||||
|
.allocator = allocator,
|
||||||
|
});
|
||||||
|
defer response.deinit();
|
||||||
|
|
||||||
|
while (response.reset() != .closing) {
|
||||||
|
// Handle errors during request processing.
|
||||||
|
response.wait() catch |err| switch (err) {
|
||||||
|
error.HttpHeadersInvalid => continue :outer,
|
||||||
|
error.EndOfStream => continue,
|
||||||
|
else => return err,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Process the request.
|
||||||
|
try handleRequest(&response, allocator);
|
||||||
}
|
}
|
||||||
return;
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle an individual request.
|
||||||
|
fn handleRequest(response: *http.Server.Response, allocator: std.mem.Allocator) !void {
|
||||||
|
// Log the request details.
|
||||||
|
log.info("{s} {s} {s}", .{ @tagName(response.request.method), @tagName(response.request.version), response.request.target });
|
||||||
|
|
||||||
|
// Read the request body.
|
||||||
|
const body = try response.reader().readAllAlloc(allocator, 8192);
|
||||||
|
defer allocator.free(body);
|
||||||
|
|
||||||
|
// Set "connection" header to "keep-alive" if present in request headers.
|
||||||
|
if (response.request.headers.contains("connection")) {
|
||||||
|
try response.headers.append("connection", "keep-alive");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if the request target starts with "/get".
|
||||||
|
if (std.mem.startsWith(u8, response.request.target, "/get")) {
|
||||||
|
// Check if the request target contains "?chunked".
|
||||||
|
if (std.mem.indexOf(u8, response.request.target, "?chunked") != null) {
|
||||||
|
response.transfer_encoding = .chunked;
|
||||||
|
} else {
|
||||||
|
response.transfer_encoding = .{ .content_length = 10 };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set "content-type" header to "text/plain".
|
||||||
|
try response.headers.append("content-type", "text/plain");
|
||||||
|
|
||||||
|
// Write the response body.
|
||||||
|
try response.do();
|
||||||
|
if (response.request.method != .HEAD) {
|
||||||
|
try response.writeAll("Zig ");
|
||||||
|
try response.writeAll("Bits!\n");
|
||||||
|
try response.finish();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Set the response status to 404 (not found).
|
||||||
|
response.status = .not_found;
|
||||||
|
try response.do();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn main() !void {
|
||||||
|
// Create an allocator.
|
||||||
|
var gpa = std.heap.GeneralPurposeAllocator(.{}){};
|
||||||
|
defer std.debug.assert(gpa.deinit() == .ok);
|
||||||
|
const allocator = gpa.allocator();
|
||||||
|
|
||||||
|
// Initialize the server.
|
||||||
|
var server = http.Server.init(allocator, .{ .reuse_address = true });
|
||||||
|
defer server.deinit();
|
||||||
|
|
||||||
|
// Log the server address and port.
|
||||||
|
log.info("Server is running at {s}:{d}", .{ server_addr, server_port });
|
||||||
|
|
||||||
|
// Parse the server address.
|
||||||
|
const address = try std.net.Address.parseIp(server_addr, server_port);
|
||||||
|
try server.listen(address);
|
||||||
|
|
||||||
|
// Run the server.
|
||||||
|
runServer(&server, allocator) catch |err| {
|
||||||
|
// Handle server errors.
|
||||||
|
log.err("server error: {}\n", .{err});
|
||||||
|
if (@errorReturnTrace()) |trace| {
|
||||||
|
std.debug.dumpStackTrace(trace.*);
|
||||||
|
}
|
||||||
|
std.os.exit(1);
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
32
src/zx.zig
Normal file
32
src/zx.zig
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
const std = @import("std");
|
||||||
|
const http = std.http;
|
||||||
|
const log = std.log.scoped(.server);
|
||||||
|
|
||||||
|
const server_addr = "127.0.0.1";
|
||||||
|
const server_port = 8000;
|
||||||
|
|
||||||
|
pub const Zx = struct {
|
||||||
|
|
||||||
|
pub fn init( allocator: std.mem.Allocator,) Zx {
|
||||||
|
var server = http.Server.init(allocator, .{ .reuse_address = true });
|
||||||
|
defer server.deinit();
|
||||||
|
|
||||||
|
// Log the server address and port.
|
||||||
|
log.info("Server is running at {s}:{d}", .{ server_addr, server_port });
|
||||||
|
|
||||||
|
// Parse the server address.
|
||||||
|
const address = try std.net.Address.parseIp(server_addr, server_port);
|
||||||
|
try server.listen(address);
|
||||||
|
|
||||||
|
// Run the server.
|
||||||
|
runServer(&server, allocator) catch |err| {
|
||||||
|
// Handle server errors.
|
||||||
|
log.err("server error: {}\n", .{err});
|
||||||
|
if (@errorReturnTrace()) |trace| {
|
||||||
|
std.debug.dumpStackTrace(trace.*);
|
||||||
|
}
|
||||||
|
std.os.exit(1);
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
};
|
Loading…
Reference in New Issue
Block a user