core: Upgrade libmoo (u64 request_id migration) libmoo previously used i64 for request_id. While Roon server accepts requests with i64 request_id, having negative number IDs looks weird. Also, the current implementation starts from 0 thus half of the space has been remaining unused. Using u64 for request_id just has pros.

Changes

6 changed files (+20/-20)

• core/build.zig.zon
  • @@ -24,8 +24,8 @@ .url = "https://git.pocka.jp/libsood.git/archive/8080245c2696cc6404b0628e5c3eb363cb80014f.tar.gz",
    .hash = "sood-0.0.0-A_jj-7ITAQAPlaaR2AHFXwPvBWzNBCCPTT--OCHnRQ_i", }, .libmoo = .{ - .url = "https://git.pocka.jp/libmoo.git/archive/8802c467fceb74fd39513c5f2861525c557dd920.tar.gz", - .hash = "libmoo-0.0.0-HVqw0kUaAQBe_3frMgBgQiR42lZN-8y3kUiw-GlBw6Eb", + .url = "https://git.pocka.jp/libmoo.git/archive/2f073dbe0e73f46e0832e1a2f0501969a929c1f3.tar.gz", + .hash = "libmoo-0.0.0-HVqw0kUaAQBEDpkiC5_DX2Hh1ZTZvQ62nFL9IfuVxqdS", }, .websocket = .{ .url = "https://github.com/karlseguin/websocket.zig/archive/c1c53b062eab871b95b70409daadfd6ac3d6df61.tar.gz",
• core/src/connection.zig
  • @@ -367,16 +367,16 @@
    pub const Internal = struct { server: *discovery.Server, ws: ?websocket.Client = null, - request_id: i64 = 0, + request_id: u64 = 0, subscription_id: u64 = 0, host: []const u8, - zone_subscription_request_id: ?i64 = null, + zone_subscription_request_id: ?u64 = null, arc: Arc = .{}, saved_token: ?[]const u8 = null, - browse_listeners: std.AutoHashMap(i64, BrowseListener), - load_listeners: std.AutoHashMap(i64, LoadListener), - image_listeners: std.AutoHashMap(i64, ImageListener), - control_events: std.AutoHashMap(i64, std.Thread.ResetEvent), + browse_listeners: std.AutoHashMap(u64, BrowseListener), + load_listeners: std.AutoHashMap(u64, LoadListener), + image_listeners: std.AutoHashMap(u64, ImageListener), + control_events: std.AutoHashMap(u64, std.Thread.ResetEvent), fn init(server: *discovery.Server, token: ?[]const u8) !Internal { var addr = std.ArrayList(u8).init(allocator);
  • @@ -404,10 +404,10 @@ return .{
    .server = server.retain(), .host = host, .saved_token = saved_token, - .browse_listeners = std.AutoHashMap(i64, BrowseListener).init(allocator), - .load_listeners = std.AutoHashMap(i64, LoadListener).init(allocator), - .image_listeners = std.AutoHashMap(i64, ImageListener).init(allocator), - .control_events = std.AutoHashMap(i64, std.Thread.ResetEvent).init(allocator), + .browse_listeners = std.AutoHashMap(u64, BrowseListener).init(allocator), + .load_listeners = std.AutoHashMap(u64, LoadListener).init(allocator), + .image_listeners = std.AutoHashMap(u64, ImageListener).init(allocator), + .control_events = std.AutoHashMap(u64, std.Thread.ResetEvent).init(allocator), }; }
  • @@ -708,7 +708,7 @@
    std.log.debug("Performing WebSocket handshake...", .{}); try ws.handshake("/api", .{ .timeout_ms = 1_000 }); - var request_id: i64 = 0; + var request_id: u64 = 0; { {
• core/src/services/ImageService.zig
  • @@ -69,7 +69,7 @@
    pub fn encode( self: @This(), allocator: std.mem.Allocator, - request_id: i64, + request_id: u64, ) ![]u8 { const meta = moo.Metadata{ .service = id ++ method,
• core/src/services/browse.zig
  • @@ -122,7 +122,7 @@ /// Caller owns the returned memory
    pub fn encode( self: Request, allocator: std.mem.Allocator, - request_id: i64, + request_id: u64, ) ![]u8 { const meta = moo.Metadata{ .service = id ++ method,
  • @@ -202,7 +202,7 @@ /// Caller owns the returned memory
    pub fn encode( self: Request, allocator: std.mem.Allocator, - request_id: i64, + request_id: u64, ) ![]u8 { const meta = moo.Metadata{ .service = id ++ method,
• core/src/services/registry.zig
  • @@ -81,7 +81,7 @@ display_version: []const u8,
    }; /// Caller owns the returned memory - pub fn request(allocator: std.mem.Allocator, request_id: i64) ![]u8 { + pub fn request(allocator: std.mem.Allocator, request_id: u64) ![]u8 { const meta = moo.Metadata{ .service = id ++ "/info", .verb = "REQUEST",
  • @@ -129,7 +129,7 @@
    /// Caller owns the returned memory pub fn request( allocator: std.mem.Allocator, - request_id: i64, + request_id: u64, extension: *const Extension, token: ?[]const u8, ) ![]u8 {
• core/src/services/transport.zig
  • @@ -87,7 +87,7 @@ pub const Request = struct {
    subscription_key: []const u8, }; - pub fn request(allocator: std.mem.Allocator, request_id: i64, subscription_id: u64) ![]u8 { + pub fn request(allocator: std.mem.Allocator, request_id: u64, subscription_id: u64) ![]u8 { const meta = moo.Metadata{ .service = id ++ "/subscribe_zones", .verb = "REQUEST",
  • @@ -171,7 +171,7 @@ /// Caller owns the returned memory
    pub fn request( self: Control, allocator: std.mem.Allocator, - request_id: i64, + request_id: u64, zone_id: []const u8, ) ![]u8 { const meta = moo.Metadata{