Merge pull request #2 from vapor-community/build/valkey-swift-v0.5.0

build: Updates to valkey-swift v0.5.0

Author: NeedleInAJayStack

Package.resolved

@@ -17,7 +17,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/valkey-io/valkey-swift.git", "0.4.0" ..< "0.5.0"),
+        .package(url: "https://github.com/valkey-io/valkey-swift.git", "0.5.0" ..< "0.6.0"),
         .package(url: "https://github.com/vapor/queues.git", from: "1.12.1"),
         .package(url: "https://github.com/vapor/vapor.git", from: "4.100.0"),
         .package(url: "https://github.com/vapor-community/valkey.git", from: "1.0.0"),

Package.swift

@@ -75,10 +75,10 @@ struct ValkeyQueue: Queue {
     func get(_ id: JobIdentifier) -> EventLoopFuture<JobData> {
         eventLoopGroup.makeFutureWithTask {
             // Get the job data
-            guard let buffer = try await client.get(.init(id.key)) else {
+            guard let result = try await client.get(.init(id.key)) else {
                 throw ValkeyQueueError.missingJob
             }
-            return try decoder.decode(JobData.self, from: buffer)
+            return try decoder.decode(JobData.self, from: ByteBuffer(result))
         }
     }
 
@@ -101,16 +101,13 @@ struct ValkeyQueue: Queue {
     func pop() -> EventLoopFuture<JobIdentifier?> {
         eventLoopGroup.makeFutureWithTask {
             // Move the last job reference from queue list to processing list
-            guard let buffer = try await client.rpoplpush(
+            guard let result = try await client.rpoplpush(
                 source: .init(self.key),
                 destination: .init(self.processingKey)
             ) else {
                 return nil
             }
-            guard let id = buffer.getString(at: 0, length: buffer.readableBytes) else {
-                throw ValkeyQueueError.nonStringIdentifier
-            }
-            return .init(string: id)
+            return .init(string: String(result))
         }
     }
 

Sources/QueuesValkeyDriver/Provider+valkey.swift

@@ -68,8 +68,8 @@ struct QueuesValkeyDriverTests {
             }
 
             // ensure this failed job is still in storage
-            let buffer = try #require(await client.get(.init(jobId.key)))
-            let job = try JSONDecoder().decode(JobData.self, from: buffer)
+            let result = try #require(await client.get(.init(jobId.key)))
+            let job = try JSONDecoder().decode(JobData.self, from: ByteBuffer(result))
             #expect(job.jobName == "FailingJob")
         }
     }
@@ -102,9 +102,8 @@ struct QueuesValkeyDriverTests {
             }
 
             // Verify the delayUntil date is encoded as the correct epoch time
-            let buffer = try #require(await client.get(.init(jobId.key)))
-            let job = try #require(buffer.getData(at: 0, length: buffer.readableBytes))
-            let dict = try JSONSerialization.jsonObject(with: job, options: .allowFragments) as! [String: Any]
+            let result = try #require(await client.get(.init(jobId.key)))
+            let dict = try JSONSerialization.jsonObject(with: ByteBuffer(result), options: .allowFragments) as! [String: Any]
 
             #expect(dict["jobName"] as! String == "DelayedJob")
             #expect(dict["delayUntil"] as! Int == 1_609_477_200)