perf: 2x speed up reading contents from zip/jar

recaf-core/src/main/java/software/coley/recaf/info/builder/JvmClassInfoBuilder.java

@@ -1,13 +1,15 @@
 package software.coley.recaf.info.builder;
 
 import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import org.objectweb.asm.*;
 import software.coley.recaf.info.BasicInnerClassInfo;
 import software.coley.recaf.info.BasicJvmClassInfo;
 import software.coley.recaf.info.InnerClassInfo;
 import software.coley.recaf.info.JvmClassInfo;
 import software.coley.recaf.info.annotation.*;
 import software.coley.recaf.info.member.*;
+import software.coley.recaf.util.MultiMap;
 
 import java.util.*;
 import java.util.function.Consumer;
@@ -22,6 +24,9 @@
 public class JvmClassInfoBuilder extends AbstractClassInfoBuilder<JvmClassInfoBuilder> {
 	private byte[] bytecode;
 	private int version = JvmClassInfo.BASE_VERSION + 8; // Java 8
+	private boolean skipCustomAttributeChecks = true;
+	@Nullable
+	private ClassBuilderAppender classVisitor;
 
 	/**
 	 * Create empty builder.
@@ -89,7 +94,8 @@
 	@Nonnull
 	@SuppressWarnings(value = "deprecation")
 	public JvmClassInfoBuilder adaptFrom(@Nonnull ClassReader reader, int flags) {
-		reader.accept(new ClassBuilderAppender(), flags);
+		this.classVisitor = new ClassBuilderAppender();
+		reader.accept(classVisitor, flags);
 		return withBytecode(reader.b);
 	}
 
@@ -105,6 +111,18 @@
 		return this;
 	}
 
+	/**
+	 * The default value is true. When {@code verify} is run it will check if there are any custom attributes.
+	 *
+	 * @param skipCustomAttributeChecks {@code false} if we want to verify the classes custom attribute
+	 * @return {@code JvmClassInfoBuilder}
+	 */
+	@Nonnull
+	public JvmClassInfoBuilder skipCustomAttributeChecks(boolean skipCustomAttributeChecks) {
+		this.skipCustomAttributeChecks = skipCustomAttributeChecks;
+		return this;
+	}
+
 	public byte[] getBytecode() {
 		return bytecode;
 	}
@@ -126,6 +144,10 @@
 			throw new IllegalStateException("Bytecode required");
 		if (version < JvmClassInfo.BASE_VERSION)
 			throw new IllegalStateException("Version cannot be lower than 44 (v1)");
+		if (!this.skipCustomAttributeChecks && classVisitor != null && classVisitor.hasCustomAttributes()) {
+			throw new IllegalStateException("Unknown attributes found in class: " + this.getName() + "[" +
+				String.join(", ", classVisitor.getCustomAttributeNames()) + "]");
+		}
 	}
 
 	private class ClassBuilderAppender extends ClassVisitor {
@@ -134,9 +156,20 @@
 		private final List<InnerClassInfo> innerClasses = new ArrayList<>();
 		private final List<FieldMember> fields = new ArrayList<>();
 		private final List<MethodMember> methods = new ArrayList<>();
+		/**
+		 * Collects custom attributes in a class.
+		 */
+		private final List<Attribute> classCustomAttributes = new ArrayList<>();
+		private final MultiMap<String, Attribute, List<Attribute>> fieldCustomAttributes;
+		private final MultiMap<String, Attribute, List<Attribute>> methodCustomAttributes;
+
 
 		protected ClassBuilderAppender() {
 			super(getAsmVersion());
+			fieldCustomAttributes
+				= MultiMap.from(new HashMap<>(), ArrayList::new);
+			methodCustomAttributes
+				= MultiMap.from(new HashMap<>(), ArrayList::new);
 		}
 
 		@Override
@@ -200,9 +233,22 @@
 
 		}
 
+		@Override
+		public void visitAttribute(Attribute attribute) {
+			classCustomAttributes.add(attribute);
+			super.visitAttribute(attribute);
+		}
+
 		@Override
 		public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
 			return new FieldBuilderAppender(access, name, descriptor, signature, value) {
+
+				@Override
+				public void visitAttribute(Attribute attribute) {
+					fieldCustomAttributes.get(name).add(attribute);
+					super.visitAttribute(attribute);
+				}
+
 				@Override
 				public void visitEnd() {
 					fields.add(getFieldMember());
@@ -213,6 +259,13 @@
 		@Override
 		public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
 			return new MethodBuilderAppender(access, name, descriptor, signature, exceptions) {
+
+				@Override
+				public void visitAttribute(Attribute attribute) {
+					methodCustomAttributes.get(name).add(attribute);
+					super.visitAttribute(attribute);
+				}
+
 				@Override
 				public void visitEnd() {
 					methods.add(getMethodMember());
@@ -232,6 +285,32 @@
 			withAnnotations(annotations);
 			withTypeAnnotations(typeAnnotations);
 		}
+
+		/**
+		 * @return {@code true} when any custom attributes were found.
+		 */
+		public boolean hasCustomAttributes() {
+			return !classCustomAttributes.isEmpty() ||
+				!fieldCustomAttributes.isEmpty() ||
+				!methodCustomAttributes.isEmpty();
+		}
+
+		/**
+		 * @return Unique names of attributes found.
+		 */
+		public Collection<String> getCustomAttributeNames() {
+			Set<String> names = new TreeSet<>();
+			classCustomAttributes.stream()
+				.map(a -> a.type)
+				.forEach(names::add);
+			fieldCustomAttributes.values()
+				.map(a -> a.type)
+				.forEach(names::add);
+			methodCustomAttributes.values()
+				.map(a -> a.type)
+				.forEach(names::add);
+			return names;
+		}
 	}
 
 	private static class FieldBuilderAppender extends FieldVisitor {

recaf-core/src/main/java/software/coley/recaf/workspace/io/BasicInfoImporter.java

@@ -3,8 +3,6 @@
 import jakarta.annotation.Nonnull;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
 import org.slf4j.Logger;
 import software.coley.cafedude.classfile.VersionConstants;
 import software.coley.recaf.analytics.logging.Logging;
@@ -15,7 +13,6 @@
 import software.coley.recaf.util.IOUtil;
 import software.coley.recaf.util.android.AndroidXmlUtil;
 import software.coley.recaf.util.io.ByteSource;
-import software.coley.recaf.util.visitors.CustomAttributeCollectingVisitor;
 
 import java.io.IOException;
 
@@ -44,26 +41,30 @@
 		// Check for Java classes
 		if (matchesClass(data)) {
 			try {
-				// Patch if not compatible with ASM
-				if (!isAsmCompliantClass(data)) {
-					byte[] patched = classPatcher.patch(name, data);
+				if (config.doSkipAsmValidation()) {
+					return new JvmClassInfoBuilder(data).build();
+				}
 
-					// Ensure the patch was successful
-					if (!isAsmCompliantClass(patched)) {
+				try {
+					return new JvmClassInfoBuilder(data)
+						.skipCustomAttributeChecks(false)
+						.build();
+				} catch (Throwable t) {
+					// Patch if not compatible with ASM
+					byte[] patched = classPatcher.patch(name, data);
+					logger.debug("CafeDude patched class: {}", name);
+					try {
+						return new JvmClassInfoBuilder(patched)
+							.skipCustomAttributeChecks(false)
+							.build();
+					} catch (Throwable t1) {
 						logger.error("CafeDude patching output is still non-compliant with ASM for file: {}", name);
 						return new FileInfoBuilder<>()
-								.withRawContent(data)
-								.withName(name)
-								.build();
-					} else {
-						logger.debug("CafeDude patched class: {}", name);
-						return new JvmClassInfoBuilder(patched)
-								.build();
+							.withRawContent(data)
+							.withName(name)
+							.build();
 					}
 				}
-
-				// Yield class
-				return new JvmClassInfoBuilder(data).build();
 			} catch (Throwable t) {
 				// Invalid class, either some new edge case we need to add to CafeDude, or the file
 				// isn't a class, but the structure models it close enough to look like one at a glance.
@@ -181,34 +182,6 @@
 		return cpSize >= 4;
 	}
 
-	/**
-	 * Check if the class can be parsed by ASM.
-	 *
-	 * @param content
-	 * 		The class file content.
-	 *
-	 * @return {@code true} if ASM can parse the class.
-	 */
-	private boolean isAsmCompliantClass(byte[] content) {
-		// Skip validation if configured.
-		if (config.doSkipAsmValidation())
-			return true;
-
-		// ASM should be able to write back the read class.
-		try {
-			CustomAttributeCollectingVisitor visitor = new CustomAttributeCollectingVisitor(new ClassWriter(0));
-			ClassReader reader = new ClassReader(content);
-			reader.accept(visitor, 0);
-			if (visitor.hasCustomAttributes()) {
-				throw new IllegalStateException("Unknown attributes found in class: " + reader.getClassName() + "[" +
-						String.join(", ", visitor.getCustomAttributeNames()) + "]");
-			}
-			return true;
-		} catch (Throwable t) {
-			return false;
-		}
-	}
-
 	@Nonnull
 	@Override
 	public String getServiceId() {