Remove old cache

Author: finestructure

Package.resolved

@@ -27,7 +27,6 @@ let package = Package(
         .library(name: "S3Store", targets: ["S3Store"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/0xLeif/Cache.git", from: "2.1.0"),
         .package(url: "https://github.com/JohnSundell/Ink.git", from: "0.5.1"),
         .package(url: "https://github.com/swift-server/swift-prometheus.git", from: "1.0.0"),
         .package(url: "https://github.com/SwiftPackageIndex/Plot.git", branch: "main"),
@@ -63,7 +62,6 @@ let package = Package(
                     .product(name: "SPIManifest", package: "SPIManifest"),
                     .product(name: "SemanticVersion", package: "SemanticVersion"),
                     .product(name: "SwiftSoup", package: "SwiftSoup"),
-                    .product(name: "Cache", package: "cache"),
                     .product(name: "CanonicalPackageURL", package: "CanonicalPackageURL"),
                     .product(name: "CustomDump", package: "swift-custom-dump"),
                     .product(name: "Dependencies", package: "swift-dependencies"),

Package.swift

@@ -61,5 +61,22 @@ extension CurrentReferenceCacheClient {
     static var disabled: Self {
         .init(set: { _, _, _ in }, get: { _, _ in nil })
     }
+
+    static var inMemory: Self {
+        .init(
+            set: { owner, repository, reference in
+                _cache.withValue {
+                    $0[getKey(owner: owner, repository: repository)] = reference
+                }
+            },
+            get: { owner, repository in
+                _cache.withValue {
+                    $0[getKey(owner: owner, repository: repository)]
+                }
+            }
+        )
+    }
+
+    nonisolated(unsafe) static var _cache = LockIsolated<[String: String]>([:])
 }
 #endif

Sources/App/Core/CurrentReferenceCache.swift

@@ -39,7 +39,6 @@ struct EnvironmentClient {
     var collectionSigningCertificateChain: @Sendable () -> [URL] = { XCTFail("collectionSigningCertificateChain"); return [] }
     var collectionSigningPrivateKey: @Sendable () -> Data?
     var current: @Sendable () -> Environment = { XCTFail("current"); return .development }
-    var currentReferenceCache: @Sendable () -> CurrentReferenceCache?
     var dbId: @Sendable () -> String?
     var mastodonCredentials: @Sendable () -> Mastodon.Credentials?
     var random: @Sendable (_ range: ClosedRange<Double>) -> Double = { XCTFail("random"); return Double.random(in: $0) }
@@ -102,7 +101,6 @@ extension EnvironmentClient: DependencyKey {
                 Environment.get("COLLECTION_SIGNING_PRIVATE_KEY").map { Data($0.utf8) }
             },
             current: { (try? Environment.detect()) ?? .development },
-            currentReferenceCache: { .live },
             dbId: { Environment.get("DATABASE_ID") },
             mastodonCredentials: {
                 Environment.get("MASTODON_ACCESS_TOKEN")

Sources/App/Core/Dependencies/CurrentReferenceCacheClient.swift

@@ -178,14 +178,15 @@ extension Request {
 
         let docVersion = try await { () -> DocVersion in
             if reference == String.current {
-                if let ref = environment.currentReferenceCache()?.get(owner: owner, repository: repository) {
+                @Dependency(\.currentReferenceCache) var currentReferenceCache
+                if let ref = await currentReferenceCache.get(owner: owner, repository: repository) {
                     return .current(referencing: ref)
                 }
 
                 guard let params = try await DocumentationTarget.query(on: db, owner: owner, repository: repository)?.internal
                 else { throw Abort(.notFound) }
 
-                await environment.currentReferenceCache()?.set(owner: owner, repository: repository, reference: "\(params.docVersion)")
+                await currentReferenceCache.set(owner: owner, repository: repository, reference: "\(params.docVersion)")
                 return .current(referencing: "\(params.docVersion)")
             } else {
                 return .reference(reference)

Sources/App/Core/Dependencies/EnvironmentClient.swift

@@ -566,8 +566,8 @@ class PackageController_routesTests: SnapshotTestCase {
         // Test the current (~) documentation routes:
         //   /owner/package/documentation/~ + various path elements
         try await withDependencies {
+            $0.currentReferenceCache = .disabled
             $0.environment.awsDocsBucket = { "docs-bucket" }
-            $0.environment.currentReferenceCache = { nil }
             $0.httpClient.fetchDocumentation = { @Sendable _ in .init(status: .ok, body: .mockIndexHTML()) }
         } operation: {
             // setup
@@ -649,8 +649,8 @@ class PackageController_routesTests: SnapshotTestCase {
         // Test the current (~) documentation routes with baseURL rewriting:
         //   /owner/package/documentation/~ + various path elements
         try await withDependencies {
+            $0.currentReferenceCache = .disabled
             $0.environment.awsDocsBucket = { "docs-bucket" }
-            $0.environment.currentReferenceCache = { nil }
             $0.httpClient.fetchDocumentation = { @Sendable _ in .init(status: .ok, body: .mockIndexHTML(baseURL: "/owner/package/1.0.0")) }
         } operation: {
             // setup
@@ -941,8 +941,8 @@ class PackageController_routesTests: SnapshotTestCase {
 
     func test_documentation_current_css() async throws {
         try await withDependencies {
+            $0.currentReferenceCache = .disabled
             $0.environment.awsDocsBucket = { "docs-bucket" }
-            $0.environment.currentReferenceCache = { nil }
             $0.httpClient.fetchDocumentation = App.HTTPClient.echoURL()
         } operation: {
             // setup
@@ -996,8 +996,8 @@ class PackageController_routesTests: SnapshotTestCase {
 
     func test_documentation_current_js() async throws {
         try await withDependencies {
+            $0.currentReferenceCache = .disabled
             $0.environment.awsDocsBucket = { "docs-bucket" }
-            $0.environment.currentReferenceCache = { nil }
             $0.httpClient.fetchDocumentation = App.HTTPClient.echoURL()
         } operation: {
             // setup
@@ -1051,8 +1051,8 @@ class PackageController_routesTests: SnapshotTestCase {
 
     func test_documentation_current_data() async throws {
         try await withDependencies {
+            $0.currentReferenceCache = .disabled
             $0.environment.awsDocsBucket = { "docs-bucket" }
-            $0.environment.currentReferenceCache = { nil }
             $0.httpClient.fetchDocumentation = App.HTTPClient.echoURL()
         } operation: {
             // setup
@@ -1156,8 +1156,8 @@ class PackageController_routesTests: SnapshotTestCase {
         // https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/issues/2287
         // Ensure references are path encoded
         try await withDependencies {
+            $0.currentReferenceCache = .disabled
             $0.environment.awsDocsBucket = { "docs-bucket" }
-            $0.environment.currentReferenceCache = { nil }
             $0.httpClient.fetchDocumentation = { @Sendable _ in .init(status: .ok, body: .mockIndexHTML()) }
         } operation: {
             // setup
@@ -1220,8 +1220,8 @@ class PackageController_routesTests: SnapshotTestCase {
 
     func test_documentation_routes_tutorials() async throws {
         try await withDependencies {
+            $0.currentReferenceCache = .disabled
             $0.environment.awsDocsBucket = { "docs-bucket" }
-            $0.environment.currentReferenceCache = { nil  }
             $0.environment.dbId = { nil }
             $0.httpClient.fetchDocumentation = { @Sendable _ in .init(status: .ok, body: .mockIndexHTML()) }
         } operation: {
@@ -1481,7 +1481,6 @@ class PackageController_routesTests: SnapshotTestCase {
         try await withDependencies {
             $0.currentReferenceCache = .disabled
             $0.environment.awsDocsBucket = { "docs-bucket" }
-            $0.environment.currentReferenceCache = { .live }
             $0.httpClient.fetchDocumentation = { @Sendable _ in .init(status: .ok, body: .mockIndexHTML()) }
         } operation: {
             // setup
@@ -1557,10 +1556,8 @@ class PackageController_routesTests: SnapshotTestCase {
     }
 
     func test_getDocRoute_documentation_current() async throws {
-        nonisolated(unsafe) let cache = CurrentReferenceCache()
         try await withDependencies {
-            $0.currentReferenceCache = .disabled
-            $0.environment.currentReferenceCache = { cache }
+            $0.currentReferenceCache = .inMemory
         } operation: {
             // owner/repo/~/documentation/archive
             let req = Request(application: app, url: "", on: app.eventLoopGroup.next())
@@ -1578,6 +1575,7 @@ class PackageController_routesTests: SnapshotTestCase {
                 XCTFail("unexpected error: \(error)")
             }
 
+            @Dependency(\.currentReferenceCache) var cache
             await cache.set(owner: "owner", repository: "repo", reference: "1.2.3")
 
             do { // Now with the cache in place this resolves