Skip to content

Commit f183412

Browse files
committed
Add globals for library name and version
Signed-off-by: Adam Fowler <[email protected]>
1 parent fb25ad1 commit f183412

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

Sources/Valkey/Connection/ValkeyChannelHandler.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ final class ValkeyChannelHandler: ChannelInboundHandler {
288288
)
289289
)
290290
// set client info
291-
let clientInfoLibName = CLIENT.SETINFO(attr: .libname("valkey-swift"))
292-
let clientInfoLibVersion = CLIENT.SETINFO(attr: .libver("0.1.0"))
291+
let clientInfoLibName = CLIENT.SETINFO(attr: .libname(ValkeyClient.libraryName))
292+
let clientInfoLibVersion = CLIENT.SETINFO(attr: .libver(ValkeyClient.libraryVersion))
293293

294294
self.encoder.reset()
295295
helloCommand.encode(into: &self.encoder)
@@ -306,8 +306,8 @@ final class ValkeyChannelHandler: ChannelInboundHandler {
306306
context: context,
307307
pendingCommands: [
308308
.init(promise: .nio(promise), requestID: 0, deadline: deadline), // HELLO
309-
.init(promise: .ignore, requestID: 0, deadline: deadline), // CLIENT.SETINFO
310-
.init(promise: .ignore, requestID: 0, deadline: deadline), // CLIENT.SETINFO
309+
.init(promise: .ignore, requestID: 0, deadline: deadline), // CLIENT.SETINFO libname
310+
.init(promise: .ignore, requestID: 0, deadline: deadline), // CLIENT.SETINFO libver
311311
]
312312
)
313313
}

Sources/Valkey/ValkeyClient.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,14 @@ extension ValkeyClient {
162162
}
163163
}
164164

165+
@available(valkeySwift 1.0, *)
166+
extension ValkeyClient {
167+
/// library name reported to server using CLIENT SETINFO
168+
package static var libraryName: String { "valkey-swift" }
169+
/// library version reported to server using CLIENT SETINFO
170+
package static var libraryVersion: String { "0.1.0" }
171+
}
172+
165173
#if ServiceLifecycleSupport
166174
@available(valkeySwift 1.0, *)
167175
extension ValkeyClient: Service {}

Tests/ValkeyTests/Utils/NIOAsyncTestingChannel+hello.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ extension NIOAsyncTestingChannel {
2424
var expectedBuffer = ByteBuffer()
2525
expectedBuffer.writeImmutableBuffer(RESPToken(.array([.bulkString("HELLO"), .bulkString("3")])).base)
2626
expectedBuffer.writeImmutableBuffer(
27-
RESPToken(.array([.bulkString("CLIENT"), .bulkString("SETINFO"), .bulkString("lib-name"), .bulkString("valkey-swift")])).base
27+
RESPToken(.array([.bulkString("CLIENT"), .bulkString("SETINFO"), .bulkString("lib-name"), .bulkString(ValkeyClient.libraryName)])).base
2828
)
2929
expectedBuffer.writeImmutableBuffer(
30-
RESPToken(.array([.bulkString("CLIENT"), .bulkString("SETINFO"), .bulkString("lib-ver"), .bulkString("0.1.0")])).base
30+
RESPToken(.array([.bulkString("CLIENT"), .bulkString("SETINFO"), .bulkString("lib-ver"), .bulkString(ValkeyClient.libraryVersion)])).base
3131
)
3232
#expect(hello == expectedBuffer)
3333
try await self.writeInbound(

0 commit comments

Comments
 (0)