build: update thespian to use separate cbor package

This commit is contained in:
CJ van den Berg 2025-03-26 20:41:44 +01:00
parent 6eaef79f43
commit c3cda5b7fe
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
6 changed files with 33 additions and 6 deletions

View file

@ -227,6 +227,7 @@ const Process = struct {
UnsupportedType,
ExitNormal,
ExitUnexpected,
InvalidMapType,
});
fn receive_safe(self: *Process, from: tp.pid_ref, m: tp.message) Error!void {

View file

@ -26,7 +26,7 @@ const Self = @This();
const OutOfMemoryError = error{OutOfMemory};
const SpawnError = (OutOfMemoryError || error{ThespianSpawnFailed});
pub const InvalidMessageError = error{ InvalidMessage, InvalidMessageField, InvalidTargetURI };
pub const InvalidMessageError = error{ InvalidMessage, InvalidMessageField, InvalidTargetURI, InvalidMapType };
pub const StartLspError = (error{ ThespianSpawnFailed, Timeout, InvalidLspCommand } || LspError || OutOfMemoryError || cbor.Error);
pub const LspError = (error{ NoLsp, LspFailed } || OutOfMemoryError);
pub const ClientError = (error{ClientFailed} || OutOfMemoryError);
@ -131,7 +131,7 @@ pub fn restore_state(self: *Self, data: []const u8) !void {
var iter: []const u8 = data;
_ = cbor.matchValue(&iter, tp.string) catch {};
_ = cbor.decodeArrayHeader(&iter) catch |e| switch (e) {
error.InvalidType => return self.restore_state_v0(data),
error.InvalidArrayType => return self.restore_state_v0(data),
else => return tp.trace(tp.channel.debug, .{ "restore_state", "unknown format", data }),
};
self.persistent = true;
@ -191,7 +191,18 @@ pub fn restore_state_v1(self: *Self, data: []const u8) !void {
}
}
pub fn restore_state_v0(self: *Self, data: []const u8) error{ OutOfMemory, IntegerTooLarge, IntegerTooSmall, InvalidType, TooShort }!void {
pub fn restore_state_v0(self: *Self, data: []const u8) error{
OutOfMemory,
IntegerTooLarge,
IntegerTooSmall,
InvalidType,
TooShort,
InvalidFloatType,
InvalidArrayType,
InvalidPIntType,
JsonIncompatibleType,
NotAnObject,
}!void {
tp.trace(tp.channel.debug, .{"restore_state_v0"});
defer self.sort_files_by_mtime();
var name: []const u8 = undefined;

View file

@ -52,6 +52,11 @@ pub const Error = error{
CodepointTooLarge,
TtyInitError,
TtyWriteError,
InvalidFloatType,
InvalidArrayType,
InvalidPIntType,
JsonIncompatibleType,
NotAnObject,
} || std.Thread.SpawnError;
pub fn init(allocator: std.mem.Allocator, handler_ctx: *anyopaque, no_alternate: bool, _: *const fn (ctx: *anyopaque) void) Error!Self {

View file

@ -21,6 +21,11 @@ pub const Error = error{
IntegerTooSmall,
InvalidType,
TooShort,
InvalidFloatType,
InvalidArrayType,
InvalidPIntType,
JsonIncompatibleType,
NotAnObject,
};
pub const OutputHandler = fn (context: usize, parent: tp.pid_ref, arg0: []const u8, output: []const u8) void;