Compare commits
No commits in common. "1eea692a2482143958d14860289aa82109939e01" and "e8b0ff50fe2f162067399a6e44d6578194fbe848" have entirely different histories.
1eea692a24
...
e8b0ff50fe
|
|
@ -78,10 +78,6 @@ pub fn build(b: *std.Build) void {
|
|||
}
|
||||
|
||||
pub fn configureBuild(b: *std.Build, cs: *std.Build.Step.Compile, function_name: []const u8) !void {
|
||||
if (cs.rootModuleTarget().os.tag != .wasi) {
|
||||
std.log.err("Error: Cloudflare builds require compilation with -Dtarget=wasm32-wasi", .{});
|
||||
return error.WasiCompilationRequired;
|
||||
}
|
||||
const script = @embedFile("index.js");
|
||||
const wasm_name = try std.fmt.allocPrint(b.allocator, "{s}.wasm", .{cs.name});
|
||||
const deploy_cmd = CloudflareDeployStep.create(
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
.{
|
||||
.name = "cloudflare-worker-deploy",
|
||||
// This is a [Semantic Version](https://semver.org/).
|
||||
// In a future version of Zig it will be used for package deduplication.
|
||||
.version = "0.0.0",
|
||||
|
||||
// This field is optional.
|
||||
// This is currently advisory only; Zig does not yet do anything
|
||||
// with this value.
|
||||
.minimum_zig_version = "0.12.0",
|
||||
|
||||
// Specifies the set of files and directories that are included in this package.
|
||||
// Only files and directories listed here are included in the `hash` that
|
||||
// is computed for this package.
|
||||
// Paths are relative to the build root. Use the empty string (`""`) to refer to
|
||||
// the build root itself.
|
||||
// A directory listed here means that all files within, recursively, are included.
|
||||
.paths = .{
|
||||
"build.zig",
|
||||
"build.zig.zon",
|
||||
"src",
|
||||
"LICENSE",
|
||||
"README.md",
|
||||
},
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
const std = @import("std");
|
||||
const cloudflare = @import("cloudflare.zig");
|
||||
const cloudflare = @import("main.zig");
|
||||
const CloudflareDeployStep = @This();
|
||||
|
||||
pub const base_id: std.Build.Step.Id = .custom;
|
||||
|
|
@ -75,7 +75,7 @@ fn make(step: *std.Build.Step, prog_node: *std.Progress.Node) !void {
|
|||
&client,
|
||||
self.worker_name,
|
||||
self.options.wasm_dir orelse ".",
|
||||
final_script,
|
||||
script,
|
||||
al.writer(),
|
||||
std.io.getStdErr().writer(),
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,328 +0,0 @@
|
|||
const std = @import("std");
|
||||
|
||||
var x_auth_token: ?[:0]const u8 = undefined;
|
||||
var x_auth_email: ?[:0]const u8 = undefined;
|
||||
var x_auth_key: ?[:0]const u8 = undefined;
|
||||
|
||||
var auth_header_buf: [16 * 1024]u8 = undefined;
|
||||
var auth_headers: ?[]std.http.Header = null;
|
||||
|
||||
const cf_api_base = "https://api.cloudflare.com/client/v4";
|
||||
|
||||
const Wasm = struct {
|
||||
allocator: std.mem.Allocator,
|
||||
name: []const u8,
|
||||
data: []const u8,
|
||||
|
||||
const Self = @This();
|
||||
|
||||
pub fn deinit(self: *Self) void {
|
||||
self.allocator.free(self.name);
|
||||
self.allocator.free(self.data);
|
||||
}
|
||||
};
|
||||
|
||||
pub fn pushWorker(
|
||||
allocator: std.mem.Allocator,
|
||||
client: *std.http.Client,
|
||||
worker_name: []const u8,
|
||||
wasm_dir: []const u8,
|
||||
script: []const u8,
|
||||
writer: anytype,
|
||||
err_writer: anytype,
|
||||
) !void {
|
||||
var wasm = try loadWasm(allocator, script, wasm_dir);
|
||||
defer wasm.deinit();
|
||||
|
||||
var accountid = std.posix.getenv("CLOUDFLARE_ACCOUNT_ID");
|
||||
const account_id_free = accountid == null;
|
||||
if (accountid == null) accountid = try getAccountId(allocator, client);
|
||||
defer if (account_id_free) allocator.free(accountid.?);
|
||||
|
||||
try writer.print("Using Cloudflare account: {s}\n", .{accountid.?});
|
||||
|
||||
// Determine if worker exists. This lets us know if we need to enable it later
|
||||
const worker_exists = try workerExists(allocator, client, accountid.?, worker_name);
|
||||
try writer.print(
|
||||
"{s}\n",
|
||||
.{if (worker_exists) "Worker exists, will not re-enable" else "Worker is new. Will enable after code update"},
|
||||
);
|
||||
|
||||
var worker = Worker{
|
||||
.account_id = accountid.?,
|
||||
.name = worker_name,
|
||||
.wasm = wasm,
|
||||
.main_module = script,
|
||||
};
|
||||
putNewWorker(allocator, client, &worker) catch |err| {
|
||||
if (worker.errors == null) return err;
|
||||
try err_writer.print("{d} errors returned from CloudFlare:\n\n", .{worker.errors.?.len});
|
||||
for (worker.errors.?) |cf_err| {
|
||||
try err_writer.print("{s}\n", .{cf_err});
|
||||
allocator.free(cf_err);
|
||||
}
|
||||
return error.CloudFlareErrorResponse;
|
||||
};
|
||||
const subdomain = try getSubdomain(allocator, client, accountid.?);
|
||||
defer allocator.free(subdomain);
|
||||
try writer.print("Worker available at: https://{s}.{s}.workers.dev/\n", .{ worker_name, subdomain });
|
||||
if (!worker_exists)
|
||||
try enableWorker(allocator, client, accountid.?, worker_name);
|
||||
}
|
||||
|
||||
fn loadWasm(allocator: std.mem.Allocator, script: []const u8, wasm_dir: []const u8) !Wasm {
|
||||
// Looking for a string like this: import demoWasm from "demo.wasm"
|
||||
// JavaScript may or may not have ; characters. We're not doing
|
||||
// a full JS parsing here, so this may not be the most robust
|
||||
|
||||
var inx: usize = 0;
|
||||
|
||||
var name: ?[]const u8 = null;
|
||||
while (true) {
|
||||
inx = std.mem.indexOf(u8, script[inx..], "import ") orelse if (inx == 0) return error.NoImportFound else break;
|
||||
inx += "import ".len;
|
||||
|
||||
// oh god, we're not doing this: https://262.ecma-international.org/5.1/#sec-7.5
|
||||
// advance to next token - we don't care what the name is
|
||||
while (inx < script.len and script[inx] != ' ') inx += 1;
|
||||
// continue past space(s)
|
||||
while (inx < script.len and script[inx] == ' ') inx += 1;
|
||||
// We expect "from " to be next
|
||||
if (!std.mem.startsWith(u8, script[inx..], "from ")) continue;
|
||||
inx += "from ".len;
|
||||
// continue past space(s)
|
||||
while (inx < script.len and script[inx] == ' ') inx += 1;
|
||||
// We now expect the name of our file...
|
||||
if (script[inx] != '"' and script[inx] != '\'') continue; // we're not where we think we are
|
||||
const quote = script[inx]; // there are two possibilities here
|
||||
// we don't need to advance inx any more, as we're on the name, and if
|
||||
// we loop, that's ok
|
||||
inx += 1; // move off the quote onto the name
|
||||
const end_quote_inx = std.mem.indexOfScalar(u8, script[inx..], quote);
|
||||
if (end_quote_inx == null) continue;
|
||||
const candidate_name = script[inx .. inx + end_quote_inx.?];
|
||||
if (std.mem.endsWith(u8, candidate_name, ".wasm")) {
|
||||
if (name != null) // we are importing two wasm files, and we are now lost
|
||||
return error.MultipleWasmImportsUnsupported;
|
||||
name = candidate_name;
|
||||
}
|
||||
}
|
||||
if (name == null) return error.NoWasmImportFound;
|
||||
|
||||
const nm = try allocator.dupe(u8, name.?);
|
||||
errdefer allocator.free(nm);
|
||||
const path = try std.fs.path.join(allocator, &[_][]const u8{ wasm_dir, nm });
|
||||
defer allocator.free(path);
|
||||
const data = std.fs.cwd().readFileAlloc(allocator, path, std.math.maxInt(usize)) catch |e| {
|
||||
std.log.err("Could not read {s}: {}", .{ path, e });
|
||||
return e;
|
||||
};
|
||||
return Wasm{
|
||||
.allocator = allocator,
|
||||
.name = nm,
|
||||
.data = data,
|
||||
};
|
||||
}
|
||||
|
||||
fn getAccountId(allocator: std.mem.Allocator, client: *std.http.Client) ![:0]const u8 {
|
||||
const url = cf_api_base ++ "/accounts/";
|
||||
var raw_body = std.ArrayList(u8).init(allocator);
|
||||
defer raw_body.deinit();
|
||||
const req = try client.fetch(.{
|
||||
.response_storage = .{ .dynamic = &raw_body },
|
||||
.method = .GET,
|
||||
.location = .{ .url = url },
|
||||
.privileged_headers = try createAuthHeaders(),
|
||||
});
|
||||
if (req.status != .ok) {
|
||||
std.debug.print("Status is {}\n", .{req.status});
|
||||
return error.RequestFailed;
|
||||
}
|
||||
var body = try std.json.parseFromSlice(std.json.Value, allocator, raw_body.items, .{});
|
||||
defer body.deinit();
|
||||
const arr = body.value.object.get("result").?.array.items;
|
||||
if (arr.len == 0) return error.NoAccounts;
|
||||
if (arr.len > 1) return error.TooManyAccounts;
|
||||
return try allocator.dupeZ(u8, arr[0].object.get("id").?.string);
|
||||
}
|
||||
|
||||
fn enableWorker(allocator: std.mem.Allocator, client: *std.http.Client, account_id: []const u8, name: []const u8) !void {
|
||||
const enable_script = cf_api_base ++ "/accounts/{s}/workers/scripts/{s}/subdomain";
|
||||
const url = try std.fmt.allocPrint(allocator, enable_script, .{ account_id, name });
|
||||
defer allocator.free(url);
|
||||
var raw_body = std.ArrayList(u8).init(allocator);
|
||||
defer raw_body.deinit();
|
||||
var headers = std.ArrayList(std.http.Header).init(allocator);
|
||||
defer headers.deinit();
|
||||
try addAuthHeaders(&headers);
|
||||
try headers.append(.{ .name = "Content-Type", .value = "application/json; charset=UTF-8" });
|
||||
const req = try client.fetch(.{
|
||||
.response_storage = .{ .dynamic = &raw_body },
|
||||
.method = .POST,
|
||||
.payload =
|
||||
\\{ "enabled": true }
|
||||
,
|
||||
.location = .{ .url = url },
|
||||
.privileged_headers = headers.items,
|
||||
});
|
||||
|
||||
if (req.status != .ok) {
|
||||
std.debug.print("Status is {}\n", .{req.status});
|
||||
return error.RequestFailed;
|
||||
}
|
||||
}
|
||||
|
||||
/// Gets the subdomain for a worker. Caller owns memory
|
||||
fn getSubdomain(allocator: std.mem.Allocator, client: *std.http.Client, account_id: []const u8) ![]const u8 {
|
||||
const get_subdomain = cf_api_base ++ "/accounts/{s}/workers/subdomain";
|
||||
const url = try std.fmt.allocPrint(allocator, get_subdomain, .{account_id});
|
||||
defer allocator.free(url);
|
||||
|
||||
var raw_body = std.ArrayList(u8).init(allocator);
|
||||
defer raw_body.deinit();
|
||||
var headers = std.ArrayList(std.http.Header).init(allocator);
|
||||
defer headers.deinit();
|
||||
const req = try client.fetch(.{
|
||||
.response_storage = .{ .dynamic = &raw_body },
|
||||
.method = .GET,
|
||||
.location = .{ .url = url },
|
||||
.privileged_headers = try createAuthHeaders(),
|
||||
});
|
||||
if (req.status != .ok) return error.RequestNotOk;
|
||||
var body = try std.json.parseFromSlice(std.json.Value, allocator, raw_body.items, .{});
|
||||
defer body.deinit();
|
||||
return try allocator.dupe(u8, body.value.object.get("result").?.object.get("subdomain").?.string);
|
||||
}
|
||||
|
||||
const Worker = struct {
|
||||
account_id: []const u8,
|
||||
name: []const u8,
|
||||
main_module: []const u8,
|
||||
wasm: Wasm,
|
||||
errors: ?[][]const u8 = null,
|
||||
};
|
||||
fn putNewWorker(allocator: std.mem.Allocator, client: *std.http.Client, worker: *Worker) !void {
|
||||
const put_script = cf_api_base ++ "/accounts/{s}/workers/scripts/{s}?include_subdomain_availability=true&excludeScript=true";
|
||||
const url = try std.fmt.allocPrint(allocator, put_script, .{ worker.account_id, worker.name });
|
||||
defer allocator.free(url);
|
||||
const memfs = @embedFile("dist/memfs.wasm");
|
||||
const outer_script_shell = @embedFile("script_harness.js");
|
||||
const script = try std.fmt.allocPrint(allocator, "{s}{s}", .{ outer_script_shell, worker.main_module });
|
||||
defer allocator.free(script);
|
||||
const deploy_request =
|
||||
"------formdata-undici-032998177938\r\n" ++
|
||||
"Content-Disposition: form-data; name=\"metadata\"\r\n\r\n" ++
|
||||
"{{\"main_module\":\"index.js\",\"bindings\":[],\"compatibility_date\":\"2023-10-02\",\"compatibility_flags\":[]}}\r\n" ++
|
||||
"------formdata-undici-032998177938\r\n" ++
|
||||
"Content-Disposition: form-data; name=\"index.js\"; filename=\"index.js\"\r\n" ++
|
||||
"Content-Type: application/javascript+module\r\n" ++
|
||||
"\r\n" ++
|
||||
"{[script]s}\r\n" ++
|
||||
"------formdata-undici-032998177938\r\n" ++
|
||||
"Content-Disposition: form-data; name=\"./{[wasm_name]s}\"; filename=\"./{[wasm_name]s}\"\r\n" ++
|
||||
"Content-Type: application/wasm\r\n" ++
|
||||
"\r\n" ++
|
||||
"{[wasm]s}\r\n" ++
|
||||
"------formdata-undici-032998177938\r\n" ++
|
||||
"Content-Disposition: form-data; name=\"./c5f1acc97ad09df861eff9ef567c2186d4e38de3-memfs.wasm\"; filename=\"./c5f1acc97ad09df861eff9ef567c2186d4e38de3-memfs.wasm\"\r\n" ++
|
||||
"Content-Type: application/wasm\r\n" ++
|
||||
"\r\n" ++
|
||||
"{[memfs]s}\r\n" ++
|
||||
"------formdata-undici-032998177938--";
|
||||
|
||||
var headers = std.ArrayList(std.http.Header).init(allocator);
|
||||
defer headers.deinit();
|
||||
try addAuthHeaders(&headers);
|
||||
// TODO: fix this
|
||||
try headers.append(.{ .name = "Content-Type", .value = "multipart/form-data; boundary=----formdata-undici-032998177938" });
|
||||
const request_payload = try std.fmt.allocPrint(allocator, deploy_request, .{
|
||||
.script = script,
|
||||
.wasm_name = worker.wasm.name,
|
||||
.wasm = worker.wasm.data,
|
||||
.memfs = memfs,
|
||||
});
|
||||
defer allocator.free(request_payload);
|
||||
var raw_body = std.ArrayList(u8).init(allocator);
|
||||
defer raw_body.deinit();
|
||||
const req = try client.fetch(.{
|
||||
.response_storage = .{ .dynamic = &raw_body },
|
||||
.method = .PUT,
|
||||
.payload = request_payload,
|
||||
.location = .{ .url = url },
|
||||
.privileged_headers = headers.items,
|
||||
});
|
||||
|
||||
// std.debug.print("Status is {}\n", .{req.response.status});
|
||||
// std.debug.print("Url is {s}\n", .{url});
|
||||
if (req.status != .ok) {
|
||||
std.debug.print("Status is {}\n", .{req.status});
|
||||
if (req.status == .bad_request)
|
||||
worker.errors = getErrors(allocator, raw_body.items) catch null;
|
||||
return error.RequestFailed;
|
||||
}
|
||||
}
|
||||
|
||||
fn getErrors(allocator: std.mem.Allocator, response_body: []const u8) !?[][]const u8 {
|
||||
var body = try std.json.parseFromSlice(std.json.Value, allocator, response_body, .{});
|
||||
defer body.deinit();
|
||||
const arr = body.value.object.get("errors").?.array.items;
|
||||
if (arr.len == 0) return null;
|
||||
var error_list = try std.ArrayList([]const u8).initCapacity(allocator, arr.len);
|
||||
defer error_list.deinit();
|
||||
for (arr) |item| {
|
||||
error_list.appendAssumeCapacity(item.object.get("message").?.string);
|
||||
}
|
||||
return try error_list.toOwnedSlice();
|
||||
}
|
||||
|
||||
fn workerExists(allocator: std.mem.Allocator, client: *std.http.Client, account_id: []const u8, name: []const u8) !bool {
|
||||
const existence_check = cf_api_base ++ "/accounts/{s}/workers/services/{s}";
|
||||
const url = try std.fmt.allocPrint(allocator, existence_check, .{ account_id, name });
|
||||
defer allocator.free(url);
|
||||
var headers = std.ArrayList(std.http.Header).init(allocator);
|
||||
defer headers.deinit();
|
||||
const req = try client.fetch(.{
|
||||
.method = .GET,
|
||||
.location = .{ .url = url },
|
||||
.privileged_headers = try createAuthHeaders(),
|
||||
});
|
||||
// std.debug.print("Status is {}\n", .{req.response.status});
|
||||
// std.debug.print("Url is {s}\n", .{url});
|
||||
return req.status == .ok;
|
||||
}
|
||||
|
||||
threadlocal var auth_buf: [1024]u8 = undefined;
|
||||
|
||||
fn addAuthHeaders(headers: *std.ArrayList(std.http.Header)) !void {
|
||||
try headers.appendSlice(try createAuthHeaders());
|
||||
}
|
||||
fn createAuthHeaders() ![]const std.http.Header {
|
||||
if (auth_headers) |h| return h;
|
||||
|
||||
// auth_headers not defined - go make it happen
|
||||
var fb_alloc = std.heap.FixedBufferAllocator.init(&auth_header_buf);
|
||||
const alloc = fb_alloc.allocator();
|
||||
var ah = std.ArrayList(std.http.Header).init(alloc);
|
||||
|
||||
x_auth_email = std.posix.getenv("CLOUDFLARE_EMAIL");
|
||||
x_auth_key = std.posix.getenv("CLOUDFLARE_API_KEY");
|
||||
x_auth_token = std.posix.getenv("CLOUDFLARE_API_TOKEN");
|
||||
|
||||
blk: {
|
||||
if (x_auth_token) |tok| {
|
||||
const auth = try std.fmt.bufPrint(auth_buf[0..], "Bearer {s}", .{tok});
|
||||
try ah.append(.{ .name = "Authorization", .value = auth });
|
||||
break :blk;
|
||||
}
|
||||
if (x_auth_email) |email| {
|
||||
if (x_auth_key == null)
|
||||
return error.MissingCloudflareApiKeyEnvironmentVariable;
|
||||
try ah.append(.{ .name = "X-Auth-Email", .value = email });
|
||||
try ah.append(.{ .name = "X-Auth-Key", .value = x_auth_key.? });
|
||||
break :blk;
|
||||
}
|
||||
return error.NoCfAuthenticationEnvironmentVariablesSet;
|
||||
}
|
||||
auth_headers = ah.items;
|
||||
return auth_headers.?;
|
||||
}
|
||||
326
src/main.zig
326
src/main.zig
|
|
@ -1,5 +1,13 @@
|
|||
const std = @import("std");
|
||||
const cloudflare = @import("cloudflare.zig");
|
||||
|
||||
var x_auth_token: ?[:0]const u8 = undefined;
|
||||
var x_auth_email: ?[:0]const u8 = undefined;
|
||||
var x_auth_key: ?[:0]const u8 = undefined;
|
||||
|
||||
var auth_header_buf: [16 * 1024]u8 = undefined;
|
||||
var auth_headers: ?[]std.http.Header = null;
|
||||
|
||||
const cf_api_base = "https://api.cloudflare.com/client/v4";
|
||||
|
||||
pub fn main() !u8 {
|
||||
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
|
||||
|
|
@ -42,7 +50,7 @@ pub fn main() !u8 {
|
|||
return err;
|
||||
};
|
||||
|
||||
cloudflare.pushWorker(allocator, &client, worker_name, script, ".", stdout, std.io.getStdErr().writer()) catch return 1;
|
||||
pushWorker(allocator, &client, worker_name, script, ".", stdout, std.io.getStdErr().writer()) catch return 1;
|
||||
try bw.flush(); // don't forget to flush!
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -50,6 +58,320 @@ pub fn main() !u8 {
|
|||
fn usage(writer: anytype, this: []const u8) !void {
|
||||
try writer.print("usage: {s} <worker name> <script file>\n", .{this});
|
||||
}
|
||||
const Wasm = struct {
|
||||
allocator: std.mem.Allocator,
|
||||
name: []const u8,
|
||||
data: []const u8,
|
||||
|
||||
const Self = @This();
|
||||
|
||||
pub fn deinit(self: *Self) void {
|
||||
self.allocator.free(self.name);
|
||||
self.allocator.free(self.data);
|
||||
}
|
||||
};
|
||||
|
||||
pub fn pushWorker(
|
||||
allocator: std.mem.Allocator,
|
||||
client: *std.http.Client,
|
||||
worker_name: []const u8,
|
||||
wasm_dir: []const u8,
|
||||
script: []const u8,
|
||||
writer: anytype,
|
||||
err_writer: anytype,
|
||||
) !void {
|
||||
var wasm = try loadWasm(allocator, script, wasm_dir);
|
||||
defer wasm.deinit();
|
||||
|
||||
var accountid = std.posix.getenv("CLOUDFLARE_ACCOUNT_ID");
|
||||
const account_id_free = accountid == null;
|
||||
if (accountid == null) accountid = try getAccountId(allocator, client);
|
||||
defer if (account_id_free) allocator.free(accountid.?);
|
||||
|
||||
try writer.print("Using Cloudflare account: {s}\n", .{accountid.?});
|
||||
|
||||
// Determine if worker exists. This lets us know if we need to enable it later
|
||||
const worker_exists = try workerExists(allocator, client, accountid.?, worker_name);
|
||||
try writer.print(
|
||||
"{s}\n",
|
||||
.{if (worker_exists) "Worker exists, will not re-enable" else "Worker is new. Will enable after code update"},
|
||||
);
|
||||
|
||||
var worker = Worker{
|
||||
.account_id = accountid.?,
|
||||
.name = worker_name,
|
||||
.wasm = wasm,
|
||||
.main_module = script,
|
||||
};
|
||||
putNewWorker(allocator, client, &worker) catch |err| {
|
||||
if (worker.errors == null) return err;
|
||||
try err_writer.print("{d} errors returned from CloudFlare:\n\n", .{worker.errors.?.len});
|
||||
for (worker.errors.?) |cf_err| {
|
||||
try err_writer.print("{s}\n", .{cf_err});
|
||||
allocator.free(cf_err);
|
||||
}
|
||||
return error.CloudFlareErrorResponse;
|
||||
};
|
||||
const subdomain = try getSubdomain(allocator, client, accountid.?);
|
||||
defer allocator.free(subdomain);
|
||||
try writer.print("Worker available at: https://{s}.{s}.workers.dev/\n", .{ worker_name, subdomain });
|
||||
if (!worker_exists)
|
||||
try enableWorker(allocator, client, accountid.?, worker_name);
|
||||
}
|
||||
|
||||
fn loadWasm(allocator: std.mem.Allocator, script: []const u8, wasm_dir: []const u8) !Wasm {
|
||||
// Looking for a string like this: import demoWasm from "demo.wasm"
|
||||
// JavaScript may or may not have ; characters. We're not doing
|
||||
// a full JS parsing here, so this may not be the most robust
|
||||
|
||||
var inx: usize = 0;
|
||||
|
||||
var name: ?[]const u8 = null;
|
||||
while (true) {
|
||||
inx = std.mem.indexOf(u8, script[inx..], "import ") orelse if (inx == 0) return error.NoImportFound else break;
|
||||
inx += "import ".len;
|
||||
|
||||
// oh god, we're not doing this: https://262.ecma-international.org/5.1/#sec-7.5
|
||||
// advance to next token - we don't care what the name is
|
||||
while (inx < script.len and script[inx] != ' ') inx += 1;
|
||||
// continue past space(s)
|
||||
while (inx < script.len and script[inx] == ' ') inx += 1;
|
||||
// We expect "from " to be next
|
||||
if (!std.mem.startsWith(u8, script[inx..], "from ")) continue;
|
||||
inx += "from ".len;
|
||||
// continue past space(s)
|
||||
while (inx < script.len and script[inx] == ' ') inx += 1;
|
||||
// We now expect the name of our file...
|
||||
if (script[inx] != '"' and script[inx] != '\'') continue; // we're not where we think we are
|
||||
const quote = script[inx]; // there are two possibilities here
|
||||
// we don't need to advance inx any more, as we're on the name, and if
|
||||
// we loop, that's ok
|
||||
inx += 1; // move off the quote onto the name
|
||||
const end_quote_inx = std.mem.indexOfScalar(u8, script[inx..], quote);
|
||||
if (end_quote_inx == null) continue;
|
||||
const candidate_name = script[inx .. inx + end_quote_inx.?];
|
||||
if (std.mem.endsWith(u8, candidate_name, ".wasm")) {
|
||||
if (name != null) // we are importing two wasm files, and we are now lost
|
||||
return error.MultipleWasmImportsUnsupported;
|
||||
name = candidate_name;
|
||||
}
|
||||
}
|
||||
if (name == null) return error.NoWasmImportFound;
|
||||
|
||||
const nm = try allocator.dupe(u8, name.?);
|
||||
errdefer allocator.free(nm);
|
||||
const path = try std.fs.path.join(allocator, &[_][]const u8{ wasm_dir, nm });
|
||||
defer allocator.free(path);
|
||||
const data = try std.fs.cwd().readFileAlloc(allocator, path, std.math.maxInt(usize));
|
||||
return Wasm{
|
||||
.allocator = allocator,
|
||||
.name = nm,
|
||||
.data = data,
|
||||
};
|
||||
}
|
||||
|
||||
fn getAccountId(allocator: std.mem.Allocator, client: *std.http.Client) ![:0]const u8 {
|
||||
const url = cf_api_base ++ "/accounts/";
|
||||
var raw_body = std.ArrayList(u8).init(allocator);
|
||||
defer raw_body.deinit();
|
||||
const req = try client.fetch(.{
|
||||
.response_storage = .{ .dynamic = &raw_body },
|
||||
.method = .GET,
|
||||
.location = .{ .url = url },
|
||||
.privileged_headers = try createAuthHeaders(),
|
||||
});
|
||||
if (req.status != .ok) {
|
||||
std.debug.print("Status is {}\n", .{req.status});
|
||||
return error.RequestFailed;
|
||||
}
|
||||
var body = try std.json.parseFromSlice(std.json.Value, allocator, raw_body.items, .{});
|
||||
defer body.deinit();
|
||||
const arr = body.value.object.get("result").?.array.items;
|
||||
if (arr.len == 0) return error.NoAccounts;
|
||||
if (arr.len > 1) return error.TooManyAccounts;
|
||||
return try allocator.dupeZ(u8, arr[0].object.get("id").?.string);
|
||||
}
|
||||
|
||||
fn enableWorker(allocator: std.mem.Allocator, client: *std.http.Client, account_id: []const u8, name: []const u8) !void {
|
||||
const enable_script = cf_api_base ++ "/accounts/{s}/workers/scripts/{s}/subdomain";
|
||||
const url = try std.fmt.allocPrint(allocator, enable_script, .{ account_id, name });
|
||||
defer allocator.free(url);
|
||||
var raw_body = std.ArrayList(u8).init(allocator);
|
||||
defer raw_body.deinit();
|
||||
var headers = std.ArrayList(std.http.Header).init(allocator);
|
||||
defer headers.deinit();
|
||||
try addAuthHeaders(&headers);
|
||||
try headers.append(.{ .name = "Content-Type", .value = "application/json; charset=UTF-8" });
|
||||
const req = try client.fetch(.{
|
||||
.response_storage = .{ .dynamic = &raw_body },
|
||||
.method = .POST,
|
||||
.payload =
|
||||
\\{ "enabled": true }
|
||||
,
|
||||
.location = .{ .url = url },
|
||||
.privileged_headers = headers.items,
|
||||
});
|
||||
|
||||
if (req.status != .ok) {
|
||||
std.debug.print("Status is {}\n", .{req.status});
|
||||
return error.RequestFailed;
|
||||
}
|
||||
}
|
||||
|
||||
/// Gets the subdomain for a worker. Caller owns memory
|
||||
fn getSubdomain(allocator: std.mem.Allocator, client: *std.http.Client, account_id: []const u8) ![]const u8 {
|
||||
const get_subdomain = cf_api_base ++ "/accounts/{s}/workers/subdomain";
|
||||
const url = try std.fmt.allocPrint(allocator, get_subdomain, .{account_id});
|
||||
defer allocator.free(url);
|
||||
|
||||
var raw_body = std.ArrayList(u8).init(allocator);
|
||||
defer raw_body.deinit();
|
||||
var headers = std.ArrayList(std.http.Header).init(allocator);
|
||||
defer headers.deinit();
|
||||
const req = try client.fetch(.{
|
||||
.response_storage = .{ .dynamic = &raw_body },
|
||||
.method = .GET,
|
||||
.location = .{ .url = url },
|
||||
.privileged_headers = try createAuthHeaders(),
|
||||
});
|
||||
if (req.status != .ok) return error.RequestNotOk;
|
||||
var body = try std.json.parseFromSlice(std.json.Value, allocator, raw_body.items, .{});
|
||||
defer body.deinit();
|
||||
return try allocator.dupe(u8, body.value.object.get("result").?.object.get("subdomain").?.string);
|
||||
}
|
||||
|
||||
const Worker = struct {
|
||||
account_id: []const u8,
|
||||
name: []const u8,
|
||||
main_module: []const u8,
|
||||
wasm: Wasm,
|
||||
errors: ?[][]const u8 = null,
|
||||
};
|
||||
fn putNewWorker(allocator: std.mem.Allocator, client: *std.http.Client, worker: *Worker) !void {
|
||||
const put_script = cf_api_base ++ "/accounts/{s}/workers/scripts/{s}?include_subdomain_availability=true&excludeScript=true";
|
||||
const url = try std.fmt.allocPrint(allocator, put_script, .{ worker.account_id, worker.name });
|
||||
defer allocator.free(url);
|
||||
const memfs = @embedFile("dist/memfs.wasm");
|
||||
const outer_script_shell = @embedFile("script_harness.js");
|
||||
const script = try std.fmt.allocPrint(allocator, "{s}{s}", .{ outer_script_shell, worker.main_module });
|
||||
defer allocator.free(script);
|
||||
const deploy_request =
|
||||
"------formdata-undici-032998177938\r\n" ++
|
||||
"Content-Disposition: form-data; name=\"metadata\"\r\n\r\n" ++
|
||||
"{{\"main_module\":\"index.js\",\"bindings\":[],\"compatibility_date\":\"2023-10-02\",\"compatibility_flags\":[]}}\r\n" ++
|
||||
"------formdata-undici-032998177938\r\n" ++
|
||||
"Content-Disposition: form-data; name=\"index.js\"; filename=\"index.js\"\r\n" ++
|
||||
"Content-Type: application/javascript+module\r\n" ++
|
||||
"\r\n" ++
|
||||
"{[script]s}\r\n" ++
|
||||
"------formdata-undici-032998177938\r\n" ++
|
||||
"Content-Disposition: form-data; name=\"./{[wasm_name]s}\"; filename=\"./{[wasm_name]s}\"\r\n" ++
|
||||
"Content-Type: application/wasm\r\n" ++
|
||||
"\r\n" ++
|
||||
"{[wasm]s}\r\n" ++
|
||||
"------formdata-undici-032998177938\r\n" ++
|
||||
"Content-Disposition: form-data; name=\"./c5f1acc97ad09df861eff9ef567c2186d4e38de3-memfs.wasm\"; filename=\"./c5f1acc97ad09df861eff9ef567c2186d4e38de3-memfs.wasm\"\r\n" ++
|
||||
"Content-Type: application/wasm\r\n" ++
|
||||
"\r\n" ++
|
||||
"{[memfs]s}\r\n" ++
|
||||
"------formdata-undici-032998177938--";
|
||||
|
||||
var headers = std.ArrayList(std.http.Header).init(allocator);
|
||||
defer headers.deinit();
|
||||
try addAuthHeaders(&headers);
|
||||
// TODO: fix this
|
||||
try headers.append(.{ .name = "Content-Type", .value = "multipart/form-data; boundary=----formdata-undici-032998177938" });
|
||||
const request_payload = try std.fmt.allocPrint(allocator, deploy_request, .{
|
||||
.script = script,
|
||||
.wasm_name = worker.wasm.name,
|
||||
.wasm = worker.wasm.data,
|
||||
.memfs = memfs,
|
||||
});
|
||||
defer allocator.free(request_payload);
|
||||
var raw_body = std.ArrayList(u8).init(allocator);
|
||||
defer raw_body.deinit();
|
||||
const req = try client.fetch(.{
|
||||
.response_storage = .{ .dynamic = &raw_body },
|
||||
.method = .PUT,
|
||||
.payload = request_payload,
|
||||
.location = .{ .url = url },
|
||||
.privileged_headers = headers.items,
|
||||
});
|
||||
|
||||
// std.debug.print("Status is {}\n", .{req.response.status});
|
||||
// std.debug.print("Url is {s}\n", .{url});
|
||||
if (req.status != .ok) {
|
||||
std.debug.print("Status is {}\n", .{req.status});
|
||||
if (req.status == .bad_request)
|
||||
worker.errors = getErrors(allocator, raw_body.items) catch null;
|
||||
return error.RequestFailed;
|
||||
}
|
||||
}
|
||||
|
||||
fn getErrors(allocator: std.mem.Allocator, response_body: []const u8) !?[][]const u8 {
|
||||
var body = try std.json.parseFromSlice(std.json.Value, allocator, response_body, .{});
|
||||
defer body.deinit();
|
||||
const arr = body.value.object.get("errors").?.array.items;
|
||||
if (arr.len == 0) return null;
|
||||
var error_list = try std.ArrayList([]const u8).initCapacity(allocator, arr.len);
|
||||
defer error_list.deinit();
|
||||
for (arr) |item| {
|
||||
error_list.appendAssumeCapacity(item.object.get("message").?.string);
|
||||
}
|
||||
return try error_list.toOwnedSlice();
|
||||
}
|
||||
|
||||
fn workerExists(allocator: std.mem.Allocator, client: *std.http.Client, account_id: []const u8, name: []const u8) !bool {
|
||||
const existence_check = cf_api_base ++ "/accounts/{s}/workers/services/{s}";
|
||||
const url = try std.fmt.allocPrint(allocator, existence_check, .{ account_id, name });
|
||||
defer allocator.free(url);
|
||||
var headers = std.ArrayList(std.http.Header).init(allocator);
|
||||
defer headers.deinit();
|
||||
const req = try client.fetch(.{
|
||||
.method = .GET,
|
||||
.location = .{ .url = url },
|
||||
.privileged_headers = try createAuthHeaders(),
|
||||
});
|
||||
// std.debug.print("Status is {}\n", .{req.response.status});
|
||||
// std.debug.print("Url is {s}\n", .{url});
|
||||
return req.status == .ok;
|
||||
}
|
||||
|
||||
threadlocal var auth_buf: [1024]u8 = undefined;
|
||||
|
||||
fn addAuthHeaders(headers: *std.ArrayList(std.http.Header)) !void {
|
||||
try headers.appendSlice(try createAuthHeaders());
|
||||
}
|
||||
fn createAuthHeaders() ![]const std.http.Header {
|
||||
if (auth_headers) |h| return h;
|
||||
|
||||
// auth_headers not defined - go make it happen
|
||||
var fb_alloc = std.heap.FixedBufferAllocator.init(&auth_header_buf);
|
||||
const alloc = fb_alloc.allocator();
|
||||
var ah = std.ArrayList(std.http.Header).init(alloc);
|
||||
|
||||
x_auth_email = std.posix.getenv("CLOUDFLARE_EMAIL");
|
||||
x_auth_key = std.posix.getenv("CLOUDFLARE_API_KEY");
|
||||
x_auth_token = std.posix.getenv("CLOUDFLARE_API_TOKEN");
|
||||
|
||||
blk: {
|
||||
if (x_auth_token) |tok| {
|
||||
const auth = try std.fmt.bufPrint(auth_buf[0..], "Bearer {s}", .{tok});
|
||||
try ah.append(.{ .name = "Authorization", .value = auth });
|
||||
break :blk;
|
||||
}
|
||||
if (x_auth_email) |email| {
|
||||
if (x_auth_key == null)
|
||||
return error.MissingCloudflareApiKeyEnvironmentVariable;
|
||||
try ah.append(.{ .name = "X-Auth-Email", .value = email });
|
||||
try ah.append(.{ .name = "X-Auth-Key", .value = x_auth_key.? });
|
||||
break :blk;
|
||||
}
|
||||
return error.NoCfAuthenticationEnvironmentVariablesSet;
|
||||
}
|
||||
auth_headers = ah.items;
|
||||
return auth_headers.?;
|
||||
}
|
||||
|
||||
test "simple test" {
|
||||
var list = std.ArrayList(i32).init(std.testing.allocator);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user