Add CloseableInjector

I'm going to try to minimise use of this (as per
https://github.com/google/guice/wiki/Avoid-Injecting-Closable-Resources).
For example, I'm going to inject a pooling DataSource rather than
Connection objects, as per the advice at the end of the page. However,
HikariCP's DataSource implementation is itself Closeable.

Signed-off-by: Graham <gpe@openrs2.org>

archive/build.gradle.kts

@@ -16,6 +16,7 @@ dependencies {
     implementation(project(":cli"))
     implementation(project(":db"))
     implementation(project(":http"))
+    implementation(project(":inject"))
     implementation(project(":json"))
     implementation(project(":net"))
     implementation(project(":protocol"))

archive/src/main/kotlin/org/openrs2/archive/cache/DownloadCommand.kt

@@ -6,13 +6,15 @@ import com.github.ajalt.clikt.parameters.arguments.default
 import com.google.inject.Guice
 import kotlinx.coroutines.runBlocking
 import org.openrs2.archive.ArchiveModule
+import org.openrs2.inject.CloseableInjector
 
 public class DownloadCommand : CliktCommand(name = "download") {
     private val game by argument().default("oldschool")
 
     override fun run(): Unit = runBlocking {
-        val injector = Guice.createInjector(ArchiveModule)
+        CloseableInjector(Guice.createInjector(ArchiveModule)).use { injector ->
-        val downloader = injector.getInstance(CacheDownloader::class.java)
+            val downloader = injector.getInstance(CacheDownloader::class.java)
-        downloader.download(game)
+            downloader.download(game)
+        }
     }
 }

archive/src/main/kotlin/org/openrs2/archive/cache/ExportCommand.kt

@@ -8,6 +8,7 @@ import com.google.inject.Guice
 import kotlinx.coroutines.runBlocking
 import org.openrs2.archive.ArchiveModule
 import org.openrs2.cache.DiskStore
+import org.openrs2.inject.CloseableInjector
 
 public class ExportCommand : CliktCommand(name = "export") {
     private val id by argument().int()
@@ -19,11 +20,12 @@ public class ExportCommand : CliktCommand(name = "export") {
     )
 
     override fun run(): Unit = runBlocking {
-        val injector = Guice.createInjector(ArchiveModule)
+        CloseableInjector(Guice.createInjector(ArchiveModule)).use { injector ->
-        val exporter = injector.getInstance(CacheExporter::class.java)
+            val exporter = injector.getInstance(CacheExporter::class.java)
 
-        DiskStore.create(output).use { store ->
+            DiskStore.create(output).use { store ->
-            exporter.export(id, store)
+                exporter.export(id, store)
+            }
         }
     }
 }

archive/src/main/kotlin/org/openrs2/archive/cache/ImportCommand.kt

@@ -10,6 +10,7 @@ import kotlinx.coroutines.runBlocking
 import org.openrs2.archive.ArchiveModule
 import org.openrs2.cache.Store
 import org.openrs2.cli.instant
+import org.openrs2.inject.CloseableInjector
 
 public class ImportCommand : CliktCommand(name = "import") {
     private val build by option().int()
@@ -25,11 +26,12 @@ public class ImportCommand : CliktCommand(name = "import") {
     )
 
     override fun run(): Unit = runBlocking {
-        val injector = Guice.createInjector(ArchiveModule)
+        CloseableInjector(Guice.createInjector(ArchiveModule)).use { injector ->
-        val importer = injector.getInstance(CacheImporter::class.java)
+            val importer = injector.getInstance(CacheImporter::class.java)
 
-        Store.open(input).use { store ->
+            Store.open(input).use { store ->
-            importer.import(store, game, build, timestamp, name, description)
+                importer.import(store, game, build, timestamp, name, description)
+            }
         }
     }
 }

archive/src/main/kotlin/org/openrs2/archive/cache/ImportMasterIndexCommand.kt

@@ -13,6 +13,7 @@ import org.openrs2.archive.ArchiveModule
 import org.openrs2.buffer.use
 import org.openrs2.cache.MasterIndexFormat
 import org.openrs2.cli.instant
+import org.openrs2.inject.CloseableInjector
 import java.nio.file.Files
 
 public class ImportMasterIndexCommand : CliktCommand(name = "import-master-index") {
@@ -30,11 +31,12 @@ public class ImportMasterIndexCommand : CliktCommand(name = "import-master-index
     )
 
     override fun run(): Unit = runBlocking {
-        val injector = Guice.createInjector(ArchiveModule)
+        CloseableInjector(Guice.createInjector(ArchiveModule)).use { injector ->
-        val importer = injector.getInstance(CacheImporter::class.java)
+            val importer = injector.getInstance(CacheImporter::class.java)
 
-        Unpooled.wrappedBuffer(Files.readAllBytes(input)).use { buf ->
+            Unpooled.wrappedBuffer(Files.readAllBytes(input)).use { buf ->
-            importer.importMasterIndex(buf, format, game, build, timestamp, name, description)
+                importer.importMasterIndex(buf, format, game, build, timestamp, name, description)
+            }
         }
     }
 }

archive/src/main/kotlin/org/openrs2/archive/key/BruteForceCommand.kt

@@ -4,12 +4,13 @@ import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
 import kotlinx.coroutines.runBlocking
 import org.openrs2.archive.ArchiveModule
+import org.openrs2.inject.CloseableInjector
 
 public class BruteForceCommand : CliktCommand(name = "brute-force") {
     override fun run(): Unit = runBlocking {
-        val injector = Guice.createInjector(ArchiveModule)
+        CloseableInjector(Guice.createInjector(ArchiveModule)).use { injector ->
-        val bruteForcer = injector.getInstance(KeyBruteForcer::class.java)
+            val bruteForcer = injector.getInstance(KeyBruteForcer::class.java)
-
+            bruteForcer.bruteForce()
-        bruteForcer.bruteForce()
+        }
     }
 }

archive/src/main/kotlin/org/openrs2/archive/key/DownloadCommand.kt

@@ -4,11 +4,13 @@ import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
 import kotlinx.coroutines.runBlocking
 import org.openrs2.archive.ArchiveModule
+import org.openrs2.inject.CloseableInjector
 
 public class DownloadCommand : CliktCommand(name = "download") {
     override fun run(): Unit = runBlocking {
-        val injector = Guice.createInjector(ArchiveModule)
+        CloseableInjector(Guice.createInjector(ArchiveModule)).use { injector ->
-        val importer = injector.getInstance(KeyImporter::class.java)
+            val importer = injector.getInstance(KeyImporter::class.java)
-        importer.download()
+            importer.download()
+        }
     }
 }

archive/src/main/kotlin/org/openrs2/archive/key/ImportCommand.kt

@@ -6,6 +6,7 @@ import com.github.ajalt.clikt.parameters.types.path
 import com.google.inject.Guice
 import kotlinx.coroutines.runBlocking
 import org.openrs2.archive.ArchiveModule
+import org.openrs2.inject.CloseableInjector
 
 public class ImportCommand : CliktCommand(name = "import") {
     private val input by argument().path(
@@ -14,9 +15,9 @@ public class ImportCommand : CliktCommand(name = "import") {
     )
 
     override fun run(): Unit = runBlocking {
-        val injector = Guice.createInjector(ArchiveModule)
+        CloseableInjector(Guice.createInjector(ArchiveModule)).use { injector ->
-        val importer = injector.getInstance(KeyImporter::class.java)
+            val importer = injector.getInstance(KeyImporter::class.java)
-
+            importer.import(input)
-        importer.import(input)
+        }
     }
 }

archive/src/main/kotlin/org/openrs2/archive/name/DownloadCommand.kt

@@ -4,11 +4,13 @@ import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
 import kotlinx.coroutines.runBlocking
 import org.openrs2.archive.ArchiveModule
+import org.openrs2.inject.CloseableInjector
 
 public class DownloadCommand : CliktCommand(name = "download") {
     override fun run(): Unit = runBlocking {
-        val injector = Guice.createInjector(ArchiveModule)
+        CloseableInjector(Guice.createInjector(ArchiveModule)).use { injector ->
-        val importer = injector.getInstance(NameImporter::class.java)
+            val importer = injector.getInstance(NameImporter::class.java)
-        importer.download()
+            importer.download()
+        }
     }
 }

archive/src/main/kotlin/org/openrs2/archive/name/GenerateCommand.kt

@@ -4,23 +4,25 @@ import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
 import kotlinx.coroutines.runBlocking
 import org.openrs2.archive.ArchiveModule
+import org.openrs2.inject.CloseableInjector
 
 public class GenerateCommand : CliktCommand(name = "generate") {
     override fun run(): Unit = runBlocking {
-        val injector = Guice.createInjector(ArchiveModule)
+        CloseableInjector(Guice.createInjector(ArchiveModule)).use { injector ->
-        val importer = injector.getInstance(NameImporter::class.java)
+            val importer = injector.getInstance(NameImporter::class.java)
 
-        val names = mutableSetOf<String>()
+            val names = mutableSetOf<String>()
 
-        for (x in 0..99) {
+            for (x in 0..99) {
-            for (z in 0..255) {
+                for (z in 0..255) {
-                for (prefix in PREFIXES) {
+                    for (prefix in PREFIXES) {
-                    names += "$prefix${x}_$z"
+                        names += "$prefix${x}_$z"
+                    }
                 }
             }
-        }
 
-        importer.import(names)
+            importer.import(names)
+        }
     }
 
     private companion object {

archive/src/main/kotlin/org/openrs2/archive/name/ImportCommand.kt

@@ -7,16 +7,18 @@ import com.github.ajalt.clikt.parameters.types.inputStream
 import com.google.inject.Guice
 import kotlinx.coroutines.runBlocking
 import org.openrs2.archive.ArchiveModule
+import org.openrs2.inject.CloseableInjector
 
 public class ImportCommand : CliktCommand(name = "import") {
     private val input by option().inputStream().defaultStdin()
 
     override fun run(): Unit = runBlocking {
-        val injector = Guice.createInjector(ArchiveModule)
+        CloseableInjector(Guice.createInjector(ArchiveModule)).use { injector ->
-        val importer = injector.getInstance(NameImporter::class.java)
+            val importer = injector.getInstance(NameImporter::class.java)
 
-        input.bufferedReader().useLines { lines ->
+            input.bufferedReader().useLines { lines ->
-            importer.import(lines.toSet())
+                importer.import(lines.toSet())
+            }
         }
     }
 }

archive/src/main/kotlin/org/openrs2/archive/web/WebCommand.kt

@@ -3,11 +3,13 @@ package org.openrs2.archive.web
 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
 import org.openrs2.archive.ArchiveModule
+import org.openrs2.inject.CloseableInjector
 
 public class WebCommand : CliktCommand(name = "web") {
     override fun run() {
-        val injector = Guice.createInjector(ArchiveModule)
+        CloseableInjector(Guice.createInjector(ArchiveModule)).use { injector ->
-        val server = injector.getInstance(WebServer::class.java)
+            val server = injector.getInstance(WebServer::class.java)
-        server.start()
+            server.start()
+        }
     }
 }

deob-ast/build.gradle.kts

@@ -13,6 +13,7 @@ dependencies {
     api("com.github.ajalt.clikt:clikt:${Versions.clikt}")
     api("com.google.inject:guice:${Versions.guice}")
 
+    implementation(project(":inject"))
     implementation(project(":util"))
     implementation("com.github.javaparser:javaparser-symbol-solver-core:${Versions.javaParser}")
     implementation("com.google.guava:guava:${Versions.guava}")

deob-ast/src/main/kotlin/org/openrs2/deob/ast/DeobfuscateAstCommand.kt

@@ -3,13 +3,15 @@ package org.openrs2.deob.ast
 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
 import org.openrs2.deob.util.Module
+import org.openrs2.inject.CloseableInjector
 
 public fun main(args: Array<String>): Unit = DeobfuscateAstCommand().main(args)
 
 public class DeobfuscateAstCommand : CliktCommand(name = "ast") {
     override fun run() {
-        val injector = Guice.createInjector(AstDeobfuscatorModule)
+        CloseableInjector(Guice.createInjector(AstDeobfuscatorModule)).use { injector ->
-        val deobfuscator = injector.getInstance(AstDeobfuscator::class.java)
+            val deobfuscator = injector.getInstance(AstDeobfuscator::class.java)
-        deobfuscator.run(Module.ALL)
+            deobfuscator.run(Module.ALL)
+        }
     }
 }

deob-bytecode/build.gradle.kts

@@ -14,6 +14,7 @@ dependencies {
 
     implementation(project(":deob-annotations"))
     implementation(project(":deob-util"))
+    implementation(project(":inject"))
     implementation(project(":patcher"))
     implementation(project(":yaml"))
     implementation("com.google.guava:guava:${Versions.guava}")

deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscateBytecodeCommand.kt

@@ -2,17 +2,19 @@ package org.openrs2.deob.bytecode
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
+import org.openrs2.inject.CloseableInjector
 import java.nio.file.Path
 
 public fun main(args: Array<String>): Unit = DeobfuscateBytecodeCommand().main(args)
 
 public class DeobfuscateBytecodeCommand : CliktCommand(name = "bytecode") {
     override fun run() {
-        val injector = Guice.createInjector(BytecodeDeobfuscatorModule)
+        CloseableInjector(Guice.createInjector(BytecodeDeobfuscatorModule)).use { injector ->
-        val deobfuscator = injector.getInstance(BytecodeDeobfuscator::class.java)
+            val deobfuscator = injector.getInstance(BytecodeDeobfuscator::class.java)
-        deobfuscator.run(
+            deobfuscator.run(
-            input = Path.of("nonfree/lib"),
+                input = Path.of("nonfree/lib"),
-            output = Path.of("nonfree/var/cache/deob")
+                output = Path.of("nonfree/var/cache/deob")
-        )
+            )
+        }
     }
 }

deob-processor/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
 dependencies {
     implementation(project(":deob-annotations"))
     implementation(project(":deob-util"))
+    implementation(project(":inject"))
     implementation(project(":yaml"))
 }
 

deob-processor/src/main/kotlin/org/openrs2/deob/processor/NameMapProcessor.kt

@@ -12,6 +12,7 @@ import org.openrs2.deob.annotation.OriginalMember
 import org.openrs2.deob.util.map.Field
 import org.openrs2.deob.util.map.Method
 import org.openrs2.deob.util.map.NameMap
+import org.openrs2.inject.CloseableInjector
 import org.openrs2.util.io.useAtomicBufferedWriter
 import org.openrs2.yaml.Yaml
 import java.lang.reflect.Proxy
@@ -40,16 +41,12 @@ import javax.lang.model.element.VariableElement
     "map"
 )
 public class NameMapProcessor : AbstractProcessor() {
+    private val injector = CloseableInjector(Guice.createInjector(DeobfuscatorProcessorModule))
     private val map = NameMap()
-    private val mapper: ObjectMapper
+    private val mapper = injector.getInstance(Key.get(ObjectMapper::class.java, Yaml::class.java))
     private lateinit var trees: Trees
     private lateinit var localScanner: LocalVariableScanner
 
-    init {
-        val injector = Guice.createInjector(DeobfuscatorProcessorModule)
-        mapper = injector.getInstance(Key.get(ObjectMapper::class.java, Yaml::class.java))
-    }
-
     override fun init(env: ProcessingEnvironment) {
         super.init(env)
         trees = Trees.instance(unwrap(env))
@@ -124,6 +121,8 @@ public class NameMapProcessor : AbstractProcessor() {
             mapPath.useAtomicBufferedWriter { writer ->
                 mapper.writeValue(writer, combinedMap)
             }
+
+            injector.close()
         }
 
         return true

deob/build.gradle.kts

@@ -15,6 +15,7 @@ dependencies {
     implementation(project(":decompiler"))
     implementation(project(":deob-ast"))
     implementation(project(":deob-bytecode"))
+    implementation(project(":inject"))
 }
 
 publishing {

deob/src/main/kotlin/org/openrs2/deob/DeobfuscateCommand.kt

@@ -2,13 +2,15 @@ package org.openrs2.deob
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
+import org.openrs2.inject.CloseableInjector
 
 public fun main(args: Array<String>): Unit = DeobfuscateCommand().main(args)
 
 public class DeobfuscateCommand : CliktCommand(name = "deob") {
     override fun run() {
-        val injector = Guice.createInjector(DeobfuscatorModule)
+        CloseableInjector(Guice.createInjector(DeobfuscatorModule)).use { injector ->
-        val deobfuscator = injector.getInstance(Deobfuscator::class.java)
+            val deobfuscator = injector.getInstance(Deobfuscator::class.java)
-        deobfuscator.run()
+            deobfuscator.run()
+        }
     }
 }

game/build.gradle.kts

@@ -11,7 +11,7 @@ application {
 dependencies {
     api("com.github.ajalt.clikt:clikt:${Versions.clikt}")
 
-    implementation("com.google.inject:guice:${Versions.guice}")
+    implementation(project(":inject"))
 }
 
 publishing {

game/src/main/kotlin/org/openrs2/game/GameCommand.kt

@@ -2,13 +2,15 @@ package org.openrs2.game
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
+import org.openrs2.inject.CloseableInjector
 
 public fun main(args: Array<String>): Unit = GameCommand().main(args)
 
 public class GameCommand : CliktCommand(name = "game") {
     override fun run() {
-        val injector = Guice.createInjector(GameModule)
+        CloseableInjector(Guice.createInjector(GameModule)).use { injector ->
-        val server = injector.getInstance(GameServer::class.java)
+            val server = injector.getInstance(GameServer::class.java)
-        server.run()
+            server.run()
+        }
     }
 }

inject/build.gradle.kts

@@ -5,9 +5,6 @@ plugins {
 
 dependencies {
     api("com.google.inject:guice:${Versions.guice}")
-
-    implementation("com.google.guava:guava:${Versions.guava}")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinCoroutines}")
 }
 
 publishing {
@@ -16,13 +13,10 @@ publishing {
 
         pom {
             packaging = "jar"
-            name.set("OpenRS2 HTTP")
+            name.set("OpenRS2 Inject")
             description.set(
                 """
-                Guava module for creating a HTTP client with .netrc and
+                Guice extension for closing AutoCloseable singletons.
-                redirection support. The I/O dispatcher is used to run
-                asynchronous requests, as code using coroutines will likely use
-                the I/O dispatcher to read the response body.
             """.trimIndent()
             )
         }

inject/src/main/kotlin/org/openrs2/inject/CloseableInjector.kt

@@ -0,0 +1,23 @@
+package org.openrs2.inject
+
+import com.google.inject.Injector
+import com.google.inject.Scopes
+
+public class CloseableInjector(
+    private val injector: Injector
+) : Injector by injector, AutoCloseable {
+    override fun close() {
+        for (binding in allBindings.values) {
+            if (!Scopes.isSingleton(binding)) {
+                continue
+            }
+
+            val o = binding.provider.get()
+            if (o !is AutoCloseable) {
+                continue
+            }
+
+            o.close()
+        }
+    }
+}

patcher/build.gradle.kts

@@ -15,6 +15,7 @@ dependencies {
 
     implementation(project(":conf"))
     implementation(project(":crypto"))
+    implementation(project(":inject"))
     implementation("org.openrs2:openrs2-natives-all:${Versions.openrs2Natives}")
 }
 

patcher/src/main/kotlin/org/openrs2/patcher/PatchCommand.kt

@@ -2,18 +2,20 @@ package org.openrs2.patcher
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
+import org.openrs2.inject.CloseableInjector
 import java.nio.file.Path
 
 public fun main(args: Array<String>): Unit = PatchCommand().main(args)
 
 public class PatchCommand : CliktCommand(name = "patch") {
     override fun run() {
-        val injector = Guice.createInjector(PatcherModule)
+        CloseableInjector(Guice.createInjector(PatcherModule)).use { injector ->
-        val patcher = injector.getInstance(Patcher::class.java)
+            val patcher = injector.getInstance(Patcher::class.java)
-        patcher.run(
+            patcher.run(
-            input = Path.of("nonfree/lib"),
+                input = Path.of("nonfree/lib"),
-            output = Path.of("nonfree/var/cache/client"),
+                output = Path.of("nonfree/var/cache/client"),
-            keyStorePath = Path.of("etc/loader.p12")
+                keyStorePath = Path.of("etc/loader.p12")
-        )
+            )
+        }
     }
 }

settings.gradle.kts

@@ -32,6 +32,7 @@ include(
     "deob-util",
     "game",
     "http",
+    "inject",
     "json",
     "net",
     "nonfree",