aboutsummaryrefslogtreecommitdiff
path: root/src/http
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/http.zig52
-rw-r--r--src/http/async_socket.zig4
-rw-r--r--src/http/method.zig20
-rw-r--r--src/http/mime_type.zig22
-rw-r--r--src/http/url_path.zig22
-rw-r--r--src/http/websocket.zig20
-rw-r--r--src/http_client_async.zig24
7 files changed, 82 insertions, 82 deletions
diff --git a/src/http.zig b/src/http.zig
index 1016af017..06aef3094 100644
--- a/src/http.zig
+++ b/src/http.zig
@@ -1,17 +1,17 @@
// const c = @import("./c.zig");
const std = @import("std");
-const _global = @import("global.zig");
-const string = _global.string;
-const Output = _global.Output;
-const Global = _global.Global;
-const Environment = _global.Environment;
-const strings = _global.strings;
-const MutableString = _global.MutableString;
-const FeatureFlags = _global.FeatureFlags;
-const stringZ = _global.stringZ;
-const StoredFileDescriptorType = _global.StoredFileDescriptorType;
-const default_allocator = _global.default_allocator;
-const C = _global.C;
+const bun = @import("global.zig");
+const string = bun.string;
+const Output = bun.Output;
+const Global = bun.Global;
+const Environment = bun.Environment;
+const strings = bun.strings;
+const MutableString = bun.MutableString;
+const FeatureFlags = bun.FeatureFlags;
+const stringZ = bun.stringZ;
+const StoredFileDescriptorType = bun.StoredFileDescriptorType;
+const default_allocator = bun.default_allocator;
+const C = bun.C;
const Api = @import("./api/schema.zig").Api;
const ApiReader = @import("./api/schema.zig").Reader;
const ApiWriter = @import("./api/schema.zig").Writer;
@@ -784,7 +784,7 @@ pub const RequestContext = struct {
};
threadlocal var file_chunk_buf: [chunk_preamble_len + 2]u8 = undefined;
- threadlocal var symlink_buffer: [_global.MAX_PATH_BYTES]u8 = undefined;
+ threadlocal var symlink_buffer: [bun.MAX_PATH_BYTES]u8 = undefined;
threadlocal var weak_etag_buffer: [100]u8 = undefined;
threadlocal var strong_etag_buffer: [100]u8 = undefined;
threadlocal var weak_etag_tmp_buffer: [100]u8 = undefined;
@@ -811,7 +811,7 @@ pub const RequestContext = struct {
var buf: string = "";
if (node_modules_bundle.code_string == null) {
- buf = try node_modules_bundle.readCodeAsStringSlow(_global.default_allocator);
+ buf = try node_modules_bundle.readCodeAsStringSlow(bun.default_allocator);
} else {
buf = node_modules_bundle.code_string.?.str;
}
@@ -1795,7 +1795,7 @@ pub const RequestContext = struct {
// Output.prettyErrorln("<r><green>101<r><d> Hot Module Reloading connected.<r>", .{});
// Output.flush();
Analytics.Features.hot_module_reloading = true;
- var build_file_path_buf: [_global.MAX_PATH_BYTES]u8 = undefined;
+ var build_file_path_buf: [bun.MAX_PATH_BYTES]u8 = undefined;
var cmd: Api.WebsocketCommand = undefined;
var msg: Api.WebsocketMessage = .{
@@ -1804,7 +1804,7 @@ pub const RequestContext = struct {
};
var cmd_reader: ApiReader = undefined;
{
- var byte_buf: [32 + _global.MAX_PATH_BYTES]u8 = undefined;
+ var byte_buf: [32 + bun.MAX_PATH_BYTES]u8 = undefined;
var fbs = std.io.fixedBufferStream(&byte_buf);
var writer = ByteApiWriter.init(&fbs);
@@ -1890,7 +1890,7 @@ pub const RequestContext = struct {
}
// save because WebSocket's buffer is 8096
// max file path is 4096
- var path_buf = _global.constStrToU8(file_path);
+ var path_buf = bun.constStrToU8(file_path);
path_buf.ptr[path_buf.len] = 0;
var file_path_z: [:0]u8 = path_buf.ptr[0..path_buf.len :0];
const file = std.fs.openFileAbsoluteZ(file_path_z, .{ .mode = .read_only }) catch |err| {
@@ -2627,8 +2627,8 @@ pub const RequestContext = struct {
}
if (strings.eqlComptime(id, "node_modules.server.bun")) {
- if (vm.node_modules) |bun| {
- if (bun.code_string) |code| {
+ if (vm.node_modules) |_bun| {
+ if (_bun.code_string) |code| {
break :brk Blob{ .ptr = code.str.ptr, .len = code.str.len };
}
}
@@ -2642,8 +2642,8 @@ pub const RequestContext = struct {
}
if (strings.eqlComptime(id, "node_modules.server.bun")) {
- if (vm.node_modules) |bun| {
- if (bun.code_string) |code| {
+ if (vm.node_modules) |_bun| {
+ if (_bun.code_string) |code| {
break :brk Blob{ .ptr = code.str.ptr, .len = code.str.len };
}
}
@@ -2907,7 +2907,7 @@ pub const RequestContext = struct {
if (Server.editor) |editor| {
if (editor != .none) {
- editor.open(Server.editor_path, path.text, line, column, _global.default_allocator) catch |err| {
+ editor.open(Server.editor_path, path.text, line, column, bun.default_allocator) catch |err| {
if (editor != .other) {
Output.prettyErrorln("Error {s} opening in {s}", .{ @errorName(err), @tagName(editor) });
}
@@ -3200,7 +3200,7 @@ pub const Server = struct {
var opened = try tmpdir.openFile(basename, .{});
defer opened.close();
- var path_buf: [_global.MAX_PATH_BYTES]u8 = undefined;
+ var path_buf: [bun.MAX_PATH_BYTES]u8 = undefined;
try editor_.open(
Server.editor_path,
try std.os.getFdPath(opened.handle, &path_buf),
@@ -3211,7 +3211,7 @@ pub const Server = struct {
}
pub fn detectEditor(env: *DotEnv.Loader) void {
- var buf: [_global.MAX_PATH_BYTES]u8 = undefined;
+ var buf: [bun.MAX_PATH_BYTES]u8 = undefined;
var out: string = "";
// first: choose from user preference
@@ -3290,7 +3290,7 @@ pub const Server = struct {
}
}
- var _on_file_update_path_buf: [_global.MAX_PATH_BYTES]u8 = undefined;
+ var _on_file_update_path_buf: [bun.MAX_PATH_BYTES]u8 = undefined;
fn _onFileUpdate(
ctx: *Server,
events: []watcher.WatchEvent,
@@ -3410,7 +3410,7 @@ pub const Server = struct {
const loader = (ctx.bundler.options.loaders.get(Fs.PathName.init(changed_name).ext) orelse .file);
if (loader.isJavaScriptLikeOrJSON() or loader == .css) {
- var path_string: _global.PathString = undefined;
+ var path_string: bun.PathString = undefined;
var file_hash: Watcher.HashType = last_file_hash;
const abs_path: string = brk: {
if (dir_ent.entries.get(changed_name)) |file_ent| {
diff --git a/src/http/async_socket.zig b/src/http/async_socket.zig
index 7c61d994d..bdfee7412 100644
--- a/src/http/async_socket.zig
+++ b/src/http/async_socket.zig
@@ -9,7 +9,7 @@ const KeepAlive = @import("../http_client_async.zig").KeepAlive;
const Output = @import("../global.zig").Output;
const NetworkThread = @import("../network_thread.zig");
const Environment = @import("../global.zig").Environment;
-const _global = @import("../global.zig");
+const bun = @import("../global.zig");
const extremely_verbose = @import("../http_client_async.zig").extremely_verbose;
const SOCKET_FLAGS: u32 = @import("../http_client_async.zig").SOCKET_FLAGS;
const getAllocator = @import("../http_client_async.zig").getAllocator;
@@ -335,7 +335,7 @@ pub const SSL = struct {
send_frame: Yield(SSL.send) = Yield(SSL.send){},
read_frame: Yield(SSL.read) = Yield(SSL.read){},
- hostname: [_global.MAX_PATH_BYTES]u8 = undefined,
+ hostname: [bun.MAX_PATH_BYTES]u8 = undefined,
is_ssl: bool = false,
handshake_state: HandshakeState = HandshakeState.none,
diff --git a/src/http/method.zig b/src/http/method.zig
index 0b85cf761..62ea3ce7d 100644
--- a/src/http/method.zig
+++ b/src/http/method.zig
@@ -1,13 +1,13 @@
-const _global = @import("../global.zig");
-const string = _global.string;
-const Output = _global.Output;
-const Global = _global.Global;
-const Environment = _global.Environment;
-const strings = _global.strings;
-const MutableString = _global.MutableString;
-const stringZ = _global.stringZ;
-const default_allocator = _global.default_allocator;
-const C = _global.C;
+const bun = @import("../global.zig");
+const string = bun.string;
+const Output = bun.Output;
+const Global = bun.Global;
+const Environment = bun.Environment;
+const strings = bun.strings;
+const MutableString = bun.MutableString;
+const stringZ = bun.stringZ;
+const default_allocator = bun.default_allocator;
+const C = bun.C;
const std = @import("std");
pub const Method = enum {
diff --git a/src/http/mime_type.zig b/src/http/mime_type.zig
index 73b545721..65dd367cd 100644
--- a/src/http/mime_type.zig
+++ b/src/http/mime_type.zig
@@ -1,17 +1,17 @@
const std = @import("std");
-const _global = @import("../global.zig");
-const string = _global.string;
-const Output = _global.Output;
-const Global = _global.Global;
-const Environment = _global.Environment;
-const strings = _global.strings;
-const MutableString = _global.MutableString;
-const stringZ = _global.stringZ;
-const default_allocator = _global.default_allocator;
-const C = _global.C;
+const bun = @import("../global.zig");
+const string = bun.string;
+const Output = bun.Output;
+const Global = bun.Global;
+const Environment = bun.Environment;
+const strings = bun.strings;
+const MutableString = bun.MutableString;
+const stringZ = bun.stringZ;
+const default_allocator = bun.default_allocator;
+const C = bun.C;
const Loader = @import("../options.zig").Loader;
-const ComptimeStringMap = _global.ComptimeStringMap;
+const ComptimeStringMap = bun.ComptimeStringMap;
const MimeType = @This();
diff --git a/src/http/url_path.zig b/src/http/url_path.zig
index 0e4f12f83..4fcc54ae4 100644
--- a/src/http/url_path.zig
+++ b/src/http/url_path.zig
@@ -1,14 +1,14 @@
-const _global = @import("../global.zig");
-const string = _global.string;
-const Output = _global.Output;
-const toMutable = _global.constStrToU8;
-const Global = _global.Global;
-const Environment = _global.Environment;
-const strings = _global.strings;
-const MutableString = _global.MutableString;
-const stringZ = _global.stringZ;
-const default_allocator = _global.default_allocator;
-const C = _global.C;
+const bun = @import("../global.zig");
+const string = bun.string;
+const Output = bun.Output;
+const toMutable = bun.constStrToU8;
+const Global = bun.Global;
+const Environment = bun.Environment;
+const strings = bun.strings;
+const MutableString = bun.MutableString;
+const stringZ = bun.stringZ;
+const default_allocator = bun.default_allocator;
+const C = bun.C;
const PercentEncoding = @import("../query_string_map.zig").PercentEncoding;
const std = @import("std");
diff --git a/src/http/websocket.zig b/src/http/websocket.zig
index 106f18433..9fd5e212c 100644
--- a/src/http/websocket.zig
+++ b/src/http/websocket.zig
@@ -10,16 +10,16 @@ const IPv4 = std.x.os.IPv4;
const IPv6 = std.x.os.IPv6;
const Socket = std.x.os.Socket;
const os = std.os;
-const _global = @import("../global.zig");
-const string = _global.string;
-const Output = _global.Output;
-const Global = _global.Global;
-const Environment = _global.Environment;
-const strings = _global.strings;
-const MutableString = _global.MutableString;
-const stringZ = _global.stringZ;
-const default_allocator = _global.default_allocator;
-const C = _global.C;
+const bun = @import("../global.zig");
+const string = bun.string;
+const Output = bun.Output;
+const Global = bun.Global;
+const Environment = bun.Environment;
+const strings = bun.strings;
+const MutableString = bun.MutableString;
+const stringZ = bun.stringZ;
+const default_allocator = bun.default_allocator;
+const C = bun.C;
pub const Opcode = enum(u4) {
Continue = 0x0,
diff --git a/src/http_client_async.zig b/src/http_client_async.zig
index b56d664c1..8512b60cc 100644
--- a/src/http_client_async.zig
+++ b/src/http_client_async.zig
@@ -1,14 +1,14 @@
const picohttp = @import("picohttp");
-const _global = @import("./global.zig");
-const string = _global.string;
-const Output = _global.Output;
-const Global = _global.Global;
-const Environment = _global.Environment;
-const strings = _global.strings;
-const MutableString = _global.MutableString;
-const FeatureFlags = _global.FeatureFlags;
-const stringZ = _global.stringZ;
-const C = _global.C;
+const bun = @import("./global.zig");
+const string = bun.string;
+const Output = bun.Output;
+const Global = bun.Global;
+const Environment = bun.Environment;
+const strings = bun.strings;
+const MutableString = bun.MutableString;
+const FeatureFlags = bun.FeatureFlags;
+const stringZ = bun.stringZ;
+const C = bun.C;
const std = @import("std");
const URL = @import("./query_string_map.zig").URL;
const Method = @import("./http/method.zig").Method;
@@ -399,7 +399,7 @@ pub const AsyncHTTP = struct {
pub fn sendSync(this: *AsyncHTTP, comptime _: bool) anyerror!picohttp.Response {
if (this.callback_ctx == null) {
- var ctx = try _global.default_allocator.create(SingleHTTPChannel);
+ var ctx = try bun.default_allocator.create(SingleHTTPChannel);
ctx.* = SingleHTTPChannel.init();
this.callback_ctx = ctx;
} else {
@@ -410,7 +410,7 @@ pub const AsyncHTTP = struct {
this.callback = sendSyncCallback;
var batch = NetworkThread.Batch{};
- this.schedule(_global.default_allocator, &batch);
+ this.schedule(bun.default_allocator, &batch);
NetworkThread.global.pool.schedule(batch);
while (true) {
var data = @ptrCast(*SingleHTTPChannel, @alignCast(@alignOf(*SingleHTTPChannel), this.callback_ctx.?));
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-09 02:44:53 +0000