yuzucchii/discord.zig
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeberg.org/yuzu/discord.zig

Browse Source
This commit is contained in:
Nicolas 2024-11-10 21:13:32 -03:00
commit ef20c3bd7d
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/shard.zig
View File

@ -40,8 +40,8 @@ pub const ShardSocketCloseCodes = enum(u16) {
}; };
const Heart = struct { const Heart = struct {
/// interval to send heartbeats, further multiply it with the jitter
heartbeatInterval: u64, heartbeatInterval: u64,
ack: bool,
/// useful for calculating ping and resuming /// useful for calculating ping and resuming
lastBeat: i64, lastBeat: i64,
}; };
@ -52,6 +52,7 @@ const RatelimitOptions = struct {
}; };
pub const ShardOptions = struct { pub const ShardOptions = struct {
info: GatewayBotInfo,
ratelimit_options: RatelimitOptions = .{}, ratelimit_options: RatelimitOptions = .{},
}; };
@ -63,13 +64,12 @@ details: ShardDetails,
//heart: Heart = //heart: Heart =
allocator: mem.Allocator, allocator: mem.Allocator,
resume_gateway_url: ?[]const u8 = null, resume_gateway_url: ?[]const u8 = null,
info: GatewayBotInfo,
bucket: Bucket, bucket: Bucket,
ratelimit_options: RatelimitOptions, options: ShardOptions,
session_id: ?[]const u8, session_id: ?[]const u8,
sequence: std.atomic.Value(isize) = std.atomic.Value(isize).init(0), sequence: std.atomic.Value(isize) = .init(0),
heart: Heart = .{ .heartbeatInterval = 45000, .ack = false, .lastBeat = 0 }, heart: Heart = .{ .heartbeatInterval = 45000, .lastBeat = 0 },
/// ///
handler: GatewayDispatchEvent(*Self), handler: GatewayDispatchEvent(*Self),
@ -107,7 +107,7 @@ pub fn resume_(self: *Self) SendError!void {
} }
inline fn gatewayUrl(self: ?*Self) []const u8 { inline fn gatewayUrl(self: ?*Self) []const u8 {
return if (self) |s| (s.resume_gateway_url orelse s.info.url)["wss://".len..] else "gateway.discord.gg"; return if (self) |s| (s.resume_gateway_url orelse s.options.info.url)["wss://".len..] else "gateway.discord.gg";
} }
/// identifies in order to connect to Discord and get the online status, this shall be done on hello perhaps /// identifies in order to connect to Discord and get the online status, this shall be done on hello perhaps
@ -145,7 +145,14 @@ pub fn init(allocator: mem.Allocator, shard_id: usize, settings: struct {
log: Log, log: Log,
}) zlib.Error!Self { }) zlib.Error!Self {
return Self{ return Self{
.info = .{ .url = "wss://gateway.discord.gg", .shards = 1, .session_start_limit = null }, .options = ShardOptions{
.info = GatewayBotInfo{
.url = settings.options.info.url,
.shards = settings.options.info.shards,
.session_start_limit = settings.options.info.session_start_limit,
},
.ratelimit_options = settings.options.ratelimit_options,
},
.id = shard_id, .id = shard_id,
.allocator = allocator, .allocator = allocator,
.details = ShardDetails{ .details = ShardDetails{
@ -165,7 +172,6 @@ pub fn init(allocator: mem.Allocator, shard_id: usize, settings: struct {
settings.options.ratelimit_options.ratelimit_reset_interval, settings.options.ratelimit_options.ratelimit_reset_interval,
Self.calculateSafeRequests(settings.options.ratelimit_options), Self.calculateSafeRequests(settings.options.ratelimit_options),
), ),
.ratelimit_options = settings.options.ratelimit_options,
}; };
} }
@ -211,10 +217,7 @@ const ReadMessageError = mem.Allocator.Error || zlib.Error || json.ParseError(js
fn readMessage(self: *Self, _: anytype) !void { fn readMessage(self: *Self, _: anytype) !void {
try self.client.readTimeout(0); try self.client.readTimeout(0);
while (true) { while (try self.client.read()) |msg| {
const msg = (try self.client.read()) orelse
continue;
defer self.client.done(msg); defer self.client.done(msg);
// self.logif("received: {?s}\n", .{msg.data}); // self.logif("received: {?s}\n", .{msg.data});
@ -259,7 +262,6 @@ fn readMessage(self: *Self, _: anytype) !void {
self.heart = Heart{ self.heart = Heart{
// TODO: fix bug // TODO: fix bug
.heartbeatInterval = helloPayload.heartbeat_interval, .heartbeatInterval = helloPayload.heartbeat_interval,
.ack = false,
.lastBeat = 0, .lastBeat = 0,
}; };
@ -561,7 +563,7 @@ pub fn loginWithEmail(allocator: mem.Allocator, settings: struct { login: []cons
// maybe there is a better way to do this // maybe there is a better way to do this
.client = try Self._connect_ws(allocator, WS_CONNECT), .client = try Self._connect_ws(allocator, WS_CONNECT),
.session_id = undefined, .session_id = undefined,
.info = GatewayBotInfo{ .url = "wss://" ++ WS_CONNECT, .shards = 0, .session_start_limit = null }, .options = ShardOptions{ .info = GatewayBotInfo{ .url = "wss://" ++ WS_CONNECT, .shards = 0, .session_start_limit = null }, .ratelimit_options = .{} },
.handler = settings.run, .handler = settings.run,
.log = settings.log, .log = settings.log,
.packets = std.ArrayList(u8).init(allocator), .packets = std.ArrayList(u8).init(allocator),

5
src/sharder.zig
View File

@ -154,7 +154,10 @@ fn create(self: *Self, shard_id: usize) !Shard {
const shard: Shard = try Shard.init(self.allocator, shard_id, .{ const shard: Shard = try Shard.init(self.allocator, shard_id, .{
.token = self.shard_details.token, .token = self.shard_details.token,
.intents = self.shard_details.intents, .intents = self.shard_details.intents,
.options = Shard.ShardOptions{}, .options = Shard.ShardOptions{
.info = self.options.info,
.ratelimit_options = .{},
},
.run = self.handler, .run = self.handler,
.log = self.log, .log = self.log,
}); });