From 07bb22f79558ecc46f235a220b42fef4c8bdf379 Mon Sep 17 00:00:00 2001 From: Graham Date: Mon, 23 Dec 2019 16:56:12 +0000 Subject: [PATCH] Convert Library to Kotlin --- .../dev/openrs2/asm/classpath/Library.java | 172 ----------------- .../java/dev/openrs2/asm/classpath/Library.kt | 174 ++++++++++++++++++ .../java/dev/openrs2/deob/SignedClassUtils.kt | 4 +- 3 files changed, 176 insertions(+), 174 deletions(-) delete mode 100644 asm/src/main/java/dev/openrs2/asm/classpath/Library.java create mode 100644 asm/src/main/java/dev/openrs2/asm/classpath/Library.kt diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/Library.java b/asm/src/main/java/dev/openrs2/asm/classpath/Library.java deleted file mode 100644 index c6d0e04e30..0000000000 --- a/asm/src/main/java/dev/openrs2/asm/classpath/Library.java +++ /dev/null @@ -1,172 +0,0 @@ -package dev.openrs2.asm.classpath; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.SequenceInputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.TreeMap; -import java.util.jar.JarEntry; -import java.util.jar.JarInputStream; -import java.util.jar.JarOutputStream; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; - -import dev.openrs2.asm.MethodNodeUtilsKt; -import dev.openrs2.asm.remap.ClassForNameRemapper; -import dev.openrs2.util.io.DeterministicJarOutputStream; -import dev.openrs2.util.io.SkipOutputStream; -import org.apache.harmony.pack200.Pack200; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.commons.ClassRemapper; -import org.objectweb.asm.commons.Remapper; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.util.CheckClassAdapter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public final class Library implements Iterable { - private static final Logger logger = LoggerFactory.getLogger(Library.class); - - private static final String CLASS_SUFFIX = ".class"; - private static final String TEMP_PREFIX = "tmp"; - private static final String JAR_SUFFIX = ".jar"; - private static final byte[] GZIP_HEADER = { 0x1f, (byte) 0x8b }; - - public static Library readJar(Path path) throws IOException { - logger.info("Reading jar {}", path); - - var library = new Library(); - - try (var in = new JarInputStream(Files.newInputStream(path))) { - JarEntry entry; - while ((entry = in.getNextJarEntry()) != null) { - if (!entry.getName().endsWith(CLASS_SUFFIX)) { - continue; - } - - var clazz = new ClassNode(); - var reader = new ClassReader(in); - reader.accept(clazz, ClassReader.SKIP_DEBUG); - - library.add(clazz); - } - } - - return library; - } - - public static Library readPack(Path path) throws IOException { - logger.info("Reading pack {}", path); - - var temp = Files.createTempFile(TEMP_PREFIX, JAR_SUFFIX); - try { - try ( - var header = new ByteArrayInputStream(GZIP_HEADER); - var data = Files.newInputStream(path); - var in = new GZIPInputStream(new SequenceInputStream(header, data)); - var out = new JarOutputStream(Files.newOutputStream(temp)) - ) { - Pack200.newUnpacker().unpack(in, out); - return readJar(temp); - } - } finally { - Files.deleteIfExists(temp); - } - } - - private final Map classes = new TreeMap<>(); - - public Library() { - /* empty */ - } - - public Library(Library library) { - for (var clazz : library.classes.values()) { - var copy = new ClassNode(); - clazz.accept(copy); - add(copy); - } - } - - public boolean contains(String name) { - return classes.containsKey(name); - } - - public ClassNode get(String name) { - return classes.get(name); - } - - public ClassNode add(ClassNode clazz) { - return classes.put(clazz.name, clazz); - } - - public ClassNode remove(String name) { - return classes.remove(name); - } - - @Override - public Iterator iterator() { - return classes.values().iterator(); - } - - public void remap(Remapper remapper) { - var classNames = new HashSet(); - - for (var clazz : classes.values()) { - for (var method : clazz.methods) { - if (MethodNodeUtilsKt.hasCode(method)) { - ClassForNameRemapper.remap(remapper, method); - } - } - - classNames.add(clazz.name); - } - - for (var name : classNames) { - var in = classes.remove(name); - - var out = new ClassNode(); - in.accept(new ClassRemapper(out, remapper)); - - classes.put(out.name, out); - } - } - - public void writeJar(Path path) throws IOException { - logger.info("Writing jar {}", path); - - try (var out = new DeterministicJarOutputStream(Files.newOutputStream(path))) { - for (var clazz : classes.values()) { - var writer = new ClassWriter(0); - - clazz.accept(new CheckClassAdapter(writer, true)); - - out.putNextEntry(new JarEntry(clazz.name + CLASS_SUFFIX)); - out.write(writer.toByteArray()); - } - } - } - - public void writePack(Path path) throws IOException { - logger.info("Writing pack {}", path); - - var temp = Files.createTempFile(TEMP_PREFIX, JAR_SUFFIX); - try { - writeJar(temp); - - try ( - var in = new JarInputStream(Files.newInputStream(temp)); - var out = new GZIPOutputStream(new SkipOutputStream(Files.newOutputStream(path), GZIP_HEADER.length)) - ) { - Pack200.newPacker().pack(in, out); - } - } finally { - Files.deleteIfExists(temp); - } - } -} diff --git a/asm/src/main/java/dev/openrs2/asm/classpath/Library.kt b/asm/src/main/java/dev/openrs2/asm/classpath/Library.kt new file mode 100644 index 0000000000..3b25ebce94 --- /dev/null +++ b/asm/src/main/java/dev/openrs2/asm/classpath/Library.kt @@ -0,0 +1,174 @@ +package dev.openrs2.asm.classpath + +import com.github.michaelbull.logging.InlineLogger +import dev.openrs2.asm.hasCode +import dev.openrs2.asm.remap.ClassForNameRemapper +import dev.openrs2.util.io.DeterministicJarOutputStream +import dev.openrs2.util.io.SkipOutputStream +import org.apache.harmony.pack200.Pack200 +import org.objectweb.asm.ClassReader +import org.objectweb.asm.ClassWriter +import org.objectweb.asm.commons.ClassRemapper +import org.objectweb.asm.commons.Remapper +import org.objectweb.asm.tree.ClassNode +import org.objectweb.asm.util.CheckClassAdapter +import java.io.ByteArrayInputStream +import java.io.IOException +import java.io.SequenceInputStream +import java.nio.file.Files +import java.nio.file.Path +import java.util.* +import java.util.jar.JarEntry +import java.util.jar.JarInputStream +import java.util.jar.JarOutputStream +import java.util.zip.GZIPInputStream +import java.util.zip.GZIPOutputStream + +class Library constructor() : Iterable { + private val classes = TreeMap() + + constructor(library: Library) : this() { + for (clazz in library.classes.values) { + val copy = ClassNode() + clazz.accept(copy) + add(copy) + } + } + + operator fun contains(name: String): Boolean { + return classes.containsKey(name) + } + + operator fun get(name: String): ClassNode? { + return classes[name] + } + + fun add(clazz: ClassNode): ClassNode? { + return classes.put(clazz.name, clazz) + } + + fun remove(name: String): ClassNode? { + return classes.remove(name) + } + + override fun iterator(): Iterator { + return classes.values.iterator() + } + + fun remap(remapper: Remapper) { + val classNames = HashSet() + + for (clazz in classes.values) { + for (method in clazz.methods) { + if (method.hasCode()) { + ClassForNameRemapper.remap(remapper, method) + } + } + + classNames.add(clazz.name) + } + + for (name in classNames) { + val `in` = classes.remove(name) + + val out = ClassNode() + `in`!!.accept(ClassRemapper(out, remapper)) + + classes[out.name] = out + } + } + + @Throws(IOException::class) + fun writeJar(path: Path) { + logger.info { "Writing jar $path" } + + DeterministicJarOutputStream(Files.newOutputStream(path)).use { out -> + for (clazz in classes.values) { + val writer = ClassWriter(0) + + clazz.accept(CheckClassAdapter(writer, true)) + + out.putNextEntry(JarEntry(clazz.name + CLASS_SUFFIX)) + out.write(writer.toByteArray()) + } + } + } + + @Throws(IOException::class) + fun writePack(path: Path) { + logger.info { "Writing pack $path" } + + val temp = Files.createTempFile(TEMP_PREFIX, JAR_SUFFIX) + try { + writeJar(temp) + + JarInputStream(Files.newInputStream(temp)).use { `in` -> + val data = Files.newOutputStream(path) + val headerSize = GZIP_HEADER.size.toLong() + + GZIPOutputStream(SkipOutputStream(data, headerSize)).use { out -> + Pack200.newPacker().pack(`in`, out) + } + } + } finally { + Files.deleteIfExists(temp) + } + } + + companion object { + private val logger = InlineLogger() + private const val CLASS_SUFFIX = ".class" + private const val TEMP_PREFIX = "tmp" + private const val JAR_SUFFIX = ".jar" + private val GZIP_HEADER = byteArrayOf(0x1F, 0x8B.toByte()) + + @JvmStatic + @Throws(IOException::class) + fun readJar(path: Path): Library { + logger.info { "Reading jar $path" } + + val library = Library() + + JarInputStream(Files.newInputStream(path)).use { `in` -> + while (true) { + val entry = `in`.nextJarEntry + if (entry == null) { + break + } else if (!entry.name.endsWith(CLASS_SUFFIX)) { + continue + } + + val clazz = ClassNode() + val reader = ClassReader(`in`) + reader.accept(clazz, ClassReader.SKIP_DEBUG) + + library.add(clazz) + } + } + + return library + } + + @JvmStatic + @Throws(IOException::class) + fun readPack(path: Path): Library { + logger.info { "Reading pack $path" } + + val temp = Files.createTempFile(TEMP_PREFIX, JAR_SUFFIX) + try { + val header = ByteArrayInputStream(GZIP_HEADER) + val data = Files.newInputStream(path) + + GZIPInputStream(SequenceInputStream(header, data)).use { `in` -> + JarOutputStream(Files.newOutputStream(temp)).use { out -> + Pack200.newUnpacker().unpack(`in`, out) + } + } + + return readJar(temp) + } finally { + Files.deleteIfExists(temp) + } + } + } +} diff --git a/deob/src/main/java/dev/openrs2/deob/SignedClassUtils.kt b/deob/src/main/java/dev/openrs2/deob/SignedClassUtils.kt index 6d29983073..2eb07b00d7 100644 --- a/deob/src/main/java/dev/openrs2/deob/SignedClassUtils.kt +++ b/deob/src/main/java/dev/openrs2/deob/SignedClassUtils.kt @@ -38,7 +38,7 @@ object SignedClassUtils { // move loader signed classes to signlink for (name in signedClasses.union(dependencies)) { - val `in` = loader.remove(name) + val `in` = loader.remove(name)!! val out = ClassNode() `in`.accept(ClassRemapper(out, remapper)) @@ -74,7 +74,7 @@ object SignedClassUtils { val dependencies = mutableSetOf() for (signedClass in signedClasses) { - val clazz = loader[signedClass] + val clazz = loader[signedClass]!! for (field in clazz.fields) { val type = Type.getType(field.desc)