reproto 0.0.9__tar.gz → 0.1.1__tar.gz

reproto-0.1.1/.git/COMMIT_EDITMSG

@@ -0,0 +1 @@
+feat(build): update version

{reproto-0.0.9 → reproto-0.1.1}/.git/logs/HEAD

@@ -8,3 +8,7 @@ fce15b9dbffd9f37b1f2d46944ee2d0394df6565 70ded03ee69f30850c938a8129be308cb30772d
 70ded03ee69f30850c938a8129be308cb30772d9 67f54a4a3ede6749acc7c718ad97a86634215b5e iyue <ys1231@126.com> 1751004413 +0800	commit: feat: 重构类型处理系统，统一Java到Protobuf类型映射
 67f54a4a3ede6749acc7c718ad97a86634215b5e 9771dd4958faa94d3db229c129f6af35b508905a iyue <ys1231@126.com> 1751006389 +0800	commit: 🚀 性能优化：移除未使用的索引系统，提升执行效率
 9771dd4958faa94d3db229c129f6af35b508905a 9fb57064e0c53ed80af8507acaab718a1e80184e iyue <ys1231@126.com> 1751006683 +0800	commit: 📚 更新文档：反映最新架构变化和性能优化
+9fb57064e0c53ed80af8507acaab718a1e80184e e41e5aa2bc3074c2014d01ab1f603f69c327a83f iyue <ys1231@126.com> 1751010339 +0800	commit: feat: 直接使用Java源码中的实际枚举类名
+e41e5aa2bc3074c2014d01ab1f603f69c327a83f b07a43f0462bf25a8b1f4c0ca60c1b533dae1dde iyue <ys1231@126.com> 1751010729 +0800	commit: fix: 改进日志级别和错误处理
+b07a43f0462bf25a8b1f4c0ca60c1b533dae1dde 3d3cc6aab4eefed46c77dda27503bebcce88962c iyue <ys1231@126.com> 1751011389 +0800	commit: release: v2.1.0 - 重大性能优化和功能增强
+3d3cc6aab4eefed46c77dda27503bebcce88962c 7e5935774ee7a85f2523427c9100f9c578ac172f iyue <ys1231@126.com> 1751011558 +0800	commit: feat(build): update version

{reproto-0.0.9 → reproto-0.1.1}/.git/logs/refs/heads/iyue

@@ -8,3 +8,7 @@ fce15b9dbffd9f37b1f2d46944ee2d0394df6565 70ded03ee69f30850c938a8129be308cb30772d
 70ded03ee69f30850c938a8129be308cb30772d9 67f54a4a3ede6749acc7c718ad97a86634215b5e iyue <ys1231@126.com> 1751004413 +0800	commit: feat: 重构类型处理系统，统一Java到Protobuf类型映射
 67f54a4a3ede6749acc7c718ad97a86634215b5e 9771dd4958faa94d3db229c129f6af35b508905a iyue <ys1231@126.com> 1751006389 +0800	commit: 🚀 性能优化：移除未使用的索引系统，提升执行效率
 9771dd4958faa94d3db229c129f6af35b508905a 9fb57064e0c53ed80af8507acaab718a1e80184e iyue <ys1231@126.com> 1751006683 +0800	commit: 📚 更新文档：反映最新架构变化和性能优化
+9fb57064e0c53ed80af8507acaab718a1e80184e e41e5aa2bc3074c2014d01ab1f603f69c327a83f iyue <ys1231@126.com> 1751010339 +0800	commit: feat: 直接使用Java源码中的实际枚举类名
+e41e5aa2bc3074c2014d01ab1f603f69c327a83f b07a43f0462bf25a8b1f4c0ca60c1b533dae1dde iyue <ys1231@126.com> 1751010729 +0800	commit: fix: 改进日志级别和错误处理
+b07a43f0462bf25a8b1f4c0ca60c1b533dae1dde 3d3cc6aab4eefed46c77dda27503bebcce88962c iyue <ys1231@126.com> 1751011389 +0800	commit: release: v2.1.0 - 重大性能优化和功能增强
+3d3cc6aab4eefed46c77dda27503bebcce88962c 7e5935774ee7a85f2523427c9100f9c578ac172f iyue <ys1231@126.com> 1751011558 +0800	commit: feat(build): update version

{reproto-0.0.9 → reproto-0.1.1}/.git/logs/refs/remotes/gitlab/iyue

@@ -7,3 +7,7 @@ fce15b9dbffd9f37b1f2d46944ee2d0394df6565 70ded03ee69f30850c938a8129be308cb30772d
 70ded03ee69f30850c938a8129be308cb30772d9 67f54a4a3ede6749acc7c718ad97a86634215b5e iyue <ys1231@126.com> 1751004471 +0800	update by push
 67f54a4a3ede6749acc7c718ad97a86634215b5e 9771dd4958faa94d3db229c129f6af35b508905a iyue <ys1231@126.com> 1751006413 +0800	update by push
 9771dd4958faa94d3db229c129f6af35b508905a 9fb57064e0c53ed80af8507acaab718a1e80184e iyue <ys1231@126.com> 1751006704 +0800	update by push
+9fb57064e0c53ed80af8507acaab718a1e80184e e41e5aa2bc3074c2014d01ab1f603f69c327a83f iyue <ys1231@126.com> 1751010362 +0800	update by push
+e41e5aa2bc3074c2014d01ab1f603f69c327a83f b07a43f0462bf25a8b1f4c0ca60c1b533dae1dde iyue <ys1231@126.com> 1751010753 +0800	update by push
+b07a43f0462bf25a8b1f4c0ca60c1b533dae1dde 3d3cc6aab4eefed46c77dda27503bebcce88962c iyue <ys1231@126.com> 1751011478 +0800	update by push
+3d3cc6aab4eefed46c77dda27503bebcce88962c 7e5935774ee7a85f2523427c9100f9c578ac172f iyue <ys1231@126.com> 1751011568 +0800	update by push

{reproto-0.0.9 → reproto-0.1.1}/.git/logs/refs/remotes/origin/iyue

@@ -7,3 +7,7 @@ fce15b9dbffd9f37b1f2d46944ee2d0394df6565 70ded03ee69f30850c938a8129be308cb30772d
 70ded03ee69f30850c938a8129be308cb30772d9 67f54a4a3ede6749acc7c718ad97a86634215b5e iyue <ys1231@126.com> 1751004455 +0800	update by push
 67f54a4a3ede6749acc7c718ad97a86634215b5e 9771dd4958faa94d3db229c129f6af35b508905a iyue <ys1231@126.com> 1751006400 +0800	update by push
 9771dd4958faa94d3db229c129f6af35b508905a 9fb57064e0c53ed80af8507acaab718a1e80184e iyue <ys1231@126.com> 1751006693 +0800	update by push
+9fb57064e0c53ed80af8507acaab718a1e80184e e41e5aa2bc3074c2014d01ab1f603f69c327a83f iyue <ys1231@126.com> 1751010348 +0800	update by push
+e41e5aa2bc3074c2014d01ab1f603f69c327a83f b07a43f0462bf25a8b1f4c0ca60c1b533dae1dde iyue <ys1231@126.com> 1751010741 +0800	update by push
+b07a43f0462bf25a8b1f4c0ca60c1b533dae1dde 3d3cc6aab4eefed46c77dda27503bebcce88962c iyue <ys1231@126.com> 1751011447 +0800	update by push
+3d3cc6aab4eefed46c77dda27503bebcce88962c 7e5935774ee7a85f2523427c9100f9c578ac172f iyue <ys1231@126.com> 1751011577 +0800	update by push

reproto-0.1.1/.git/objects/7e/5935774ee7a85f2523427c9100f9c578ac172f

@@ -0,0 +1 @@
+x
��]j�0E�>k��R(����RB�2����:�\��%���Ƕu]	����1��UѩJ,�i��,��Y�̐���2(y2+�}��X��*5������\Ă�g�i�����%�7K��m=�̑9�F����5�4g�x����o�t\]��m�.��tCr

reproto-0.1.1/.git/refs/heads/iyue

@@ -0,0 +1 @@
+7e5935774ee7a85f2523427c9100f9c578ac172f

reproto-0.1.1/.git/refs/remotes/gitlab/iyue

@@ -0,0 +1 @@
+7e5935774ee7a85f2523427c9100f9c578ac172f

reproto-0.1.1/.git/refs/remotes/origin/iyue

@@ -0,0 +1 @@
+7e5935774ee7a85f2523427c9100f9c578ac172f

{reproto-0.0.9 → reproto-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: reproto
-Version: 0.0.9
+Version: 0.1.1
 Summary: 一个强大的逆向工程工具, 能够从任何使用Google Protobuf Lite的Android应用中自动重构出完整的.proto文件结构.
 License: Proprietary
 Keywords: protobuf,reverse-engineering,android,jadx,proto

{reproto-0.0.9 → reproto-0.1.1}/core/info_decoder.py

@@ -547,7 +547,7 @@ class InfoDecoder:
                 return real_type  # 返回原始Java类型
             return None
         except Exception as e:
-            self.logger.warning(f"    ⚠️  源码分析失败: {e}")
+            self.logger.debug(f"    🔍 源码分析失败: {e}")
             return None
 
     def _infer_message_type_from_field_name(self, field_name_raw: str) -> str:

{reproto-0.0.9 → reproto-0.1.1}/core/reconstructor.py

@@ -10,6 +10,7 @@ Author: AI Assistant
 """
 
 import re
+import os
 from pathlib import Path
 from collections import deque
 from typing import Set, Dict, List, Optional, Tuple
@@ -408,7 +409,7 @@ class ProtoReconstructor:
             target_package = '.'.join(first_class.split('.')[:-1])
         
         if not target_package:
-            self.logger.warning("⚠️  无法推断目标包名，跳过枚举解析")
+            self.logger.error("❌ 无法推断目标包名，跳过枚举解析")
             return
         
         # 解析目标包下的所有枚举
@@ -446,7 +447,7 @@ class ProtoReconstructor:
             if not java_file_path:
                 error_msg = "找不到对应的Java文件"
                 self.failed_classes[class_name] = error_msg
-                self.logger.warning(f"  ❌ {error_msg}: {class_name}")
+                self.logger.error(f"  ❌ {error_msg}: {class_name}")
                 return
             
             # 2. 尝试解析为枚举
@@ -463,7 +464,7 @@ class ProtoReconstructor:
             if not info_string:
                 error_msg = "无法从Java文件中提取protobuf信息"
                 self.failed_classes[class_name] = error_msg
-                self.logger.warning(f"  ❌ {error_msg}: {class_name}")
+                self.logger.error(f"  ❌ {error_msg}: {class_name}")
                 return
             
             # 4. 解码字节码为消息定义
@@ -480,7 +481,7 @@ class ProtoReconstructor:
             else:
                 error_msg = "字节码解码失败，可能不是protobuf消息类"
                 self.failed_classes[class_name] = error_msg
-                self.logger.warning(f"  ❌ {error_msg}: {class_name}")
+                self.logger.error(f"  ❌ {error_msg}: {class_name}")
                 
         except Exception as e:
             error_msg = f"处理异常: {str(e)}"
@@ -507,6 +508,18 @@ class ProtoReconstructor:
                 self.pending_classes.append(dep)
                 self.logger.info(f"  🔗 发现依赖: {dep}")
                 
+        # 处理枚举依赖
+        self.logger.info(f"  🔍 开始处理枚举依赖...")
+        enum_count = 0
+        for field in message_def.fields:
+            if self._is_enum_type(field.type_name):
+                self.logger.info(f"  🔢 发现枚举字段: {field.name} -> {field.type_name}")
+                self._process_enum_dependency(field.type_name)
+                enum_count += 1
+        
+        if enum_count == 0:
+            self.logger.info(f"  📊 未发现枚举依赖")
+                
     def _extract_dependencies(self, message_def: MessageDefinition) -> List[str]:
         """
         从消息定义中提取所有依赖的类名
@@ -535,7 +548,7 @@ class ProtoReconstructor:
     
     def _extract_field_dependencies(self, type_name: str, current_package: str) -> List[str]:
         """
-        从字段类型中提取所有依赖（包括map类型的键值类型）
+        从字段类型中提取所有依赖（包括map类型的键值类型和枚举类型）
         
         Args:
             type_name: 字段类型名
@@ -561,12 +574,168 @@ class ProtoReconstructor:
             
         # 处理普通类型
         else:
-            dep = self._resolve_field_dependency(type_name, current_package)
-            if dep:
-                dependencies.append(dep)
+            # 检查是否为枚举类型（以Enum开头或已知的枚举模式）
+            if self._is_enum_type(type_name):
+                # 直接处理枚举类型，尝试解析并添加到枚举定义中
+                self._process_enum_dependency(type_name)
+            else:
+                # 处理消息类型依赖
+                dep = self._resolve_field_dependency(type_name, current_package)
+                if dep:
+                    dependencies.append(dep)
         
         return dependencies
     
+    def _is_enum_type(self, type_name: str) -> bool:
+        """
+        判断类型名是否为枚举类型
+        
+        Args:
+            type_name: 类型名
+            
+        Returns:
+            是否为枚举类型
+        """
+        # 检查是否以Enum开头（混淆后的枚举名）
+        if type_name.startswith('Enum'):
+            return True
+        
+        # 检查是否在已知的枚举类型列表中
+        # 这里可以添加更多的枚举类型判断逻辑
+        return False
+    
+    def _process_enum_dependency(self, type_name: str) -> None:
+        """
+        处理枚举依赖，查找并解析枚举类
+        
+        Args:
+            type_name: 枚举类型名
+        """
+        try:
+            self.logger.info(f"    🔍 搜索枚举文件: {type_name}")
+            # 尝试在所有包中查找这个枚举类
+            enum_file_path = self._find_enum_file(type_name)
+            if enum_file_path:
+                self.logger.info(f"    ✅ 找到枚举文件: {enum_file_path}")
+                # 解析枚举文件
+                enum_values = self.java_parser.parse_enum_file(enum_file_path)
+                if enum_values:
+                    # 构造完整的枚举类名
+                    enum_class_name = self._get_enum_class_name_from_path(enum_file_path)
+                    self.logger.info(f"    📝 枚举类名: {enum_class_name}")
+                    
+                    # 创建枚举定义
+                    enum_def = self._create_enum_definition(enum_class_name, enum_values)
+                    
+                    # 检查是否有原始名称，如果有则使用原始名称
+                    original_name = self._extract_original_enum_name(enum_file_path)
+                    if original_name:
+                        self.logger.info(f"    🏷️ 使用原始名称: {original_name}")
+                        enum_def.name = original_name
+                    
+                    # 添加到枚举定义中
+                    self.enum_definitions[enum_class_name] = enum_def
+                    self.logger.info(f"    ✅ 成功处理枚举依赖: {enum_def.name} ({len(enum_def.values)} 个值)")
+                else:
+                    self.logger.error(f"    ❌ 枚举值解析失败: {enum_file_path}")
+            else:
+                self.logger.error(f"    ❌ 未找到枚举文件: {type_name}")
+                    
+        except Exception as e:
+            self.logger.error(f"  ❌ 处理枚举依赖失败 {type_name}: {e}")
+            import traceback
+            self.logger.debug(f"  详细错误: {traceback.format_exc()}")
+    
+    def _find_enum_file(self, type_name: str) -> Optional[Path]:
+        """
+        在所有包中查找枚举文件
+        
+        Args:
+            type_name: 枚举类型名
+            
+        Returns:
+            枚举文件路径或None
+        """
+        # 在整个源码目录中搜索匹配的枚举文件
+        for root, dirs, files in os.walk(self.sources_dir):
+            for file in files:
+                if file.endswith('.java') and type_name in file:
+                    file_path = Path(root) / file
+                    # 检查是否确实是这个枚举类
+                    if self._is_target_enum_file(file_path, type_name):
+                        return file_path
+        return None
+    
+    def _is_target_enum_file(self, file_path: Path, type_name: str) -> bool:
+        """
+        检查文件是否是目标枚举类
+        
+        Args:
+            file_path: Java文件路径
+            type_name: 目标枚举类型名
+            
+        Returns:
+            是否为目标枚举文件
+        """
+        try:
+            content = file_path.read_text(encoding='utf-8')
+            # 检查是否包含目标枚举类声明
+            enum_pattern = f'public\\s+enum\\s+{re.escape(type_name)}\\s+implements\\s+Internal\\.EnumLite'
+            return bool(re.search(enum_pattern, content))
+        except Exception:
+            return False
+    
+    def _get_enum_class_name_from_path(self, file_path: Path) -> str:
+        """
+        从文件路径构造完整的枚举类名
+        
+        Args:
+            file_path: 枚举文件路径
+            
+        Returns:
+            完整的枚举类名
+        """
+        # 获取相对于源码目录的路径
+        relative_path = file_path.relative_to(self.sources_dir)
+        
+        # 移除.java后缀并转换为类名
+        class_path = str(relative_path)[:-5]  # 移除.java
+        class_name = class_path.replace('/', '.')
+        
+        return class_name
+    
+    def _extract_original_enum_name(self, file_path: Path) -> Optional[str]:
+        """
+        从Java源码中提取实际的枚举类名
+        
+        Args:
+            file_path: Java文件路径
+            
+        Returns:
+            Java源码中定义的实际枚举类名
+        """
+        try:
+            content = file_path.read_text(encoding='utf-8')
+            
+            # 查找枚举类定义: public enum ClassName 或 enum ClassName
+            enum_pattern = r'(?:public\s+)?enum\s+(\w+)'
+            match = re.search(enum_pattern, content)
+            
+            if match:
+                enum_name = match.group(1)
+                self.logger.info(f"    🏷️ 从Java源码提取枚举名: {enum_name}")
+                return enum_name
+            else:
+                # 如果没找到enum定义，可能是接口或其他类型，使用文件名
+                file_name = file_path.stem
+                self.logger.info(f"    🏷️ 未找到enum定义，使用文件名: {file_name}")
+                return file_name
+                
+        except Exception as e:
+            self.logger.debug(f"    提取枚举名失败: {e}")
+            # 出错时使用文件名作为fallback
+            return file_path.stem
+    
     def _parse_map_types(self, map_content: str) -> tuple:
         """
         解析map类型的键值类型
@@ -1143,7 +1312,7 @@ class ProtoReconstructor:
         try:
             # 生成proto文件内容
             proto_content = self.proto_generator.generate_proto_file(
-                message_def, self.message_definitions
+                message_def, self.message_definitions, self.enum_definitions
             )
             
             # 确定输出路径并创建目录