chore: commit rest of files

PhoenixVX · DexrnZacAttack · PhoenixVX · commit 1d205f089429 · 2026-03-25T19:23:04.000-06:00
Co-authored-by: Dexrn ZacAttack &lt;me@dexrn.me&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION VERSION 3.30)
-project(JavaObjectStreams VERSION 1.2.0)
+project(JavaObjectStreams VERSION 1.2.1)
 
 set(CMAKE_CXX_STANDARD 20)
 
diff --git a/include/JavaObject/stream/ObjectInputStream.h b/include/JavaObject/stream/ObjectInputStream.h
@@ -30,7 +30,7 @@ namespace javaobject::stream {
         std::istream &m_input;
         bio::stream::BinaryInputStream m_stream;
 
-        type::object::ObjectTypeCodeParser m_parser;
+        type::TypeCodeParserStorage m_parsers;
     };
 
     //some people might prefer STL naming scheme for this, so why not:
diff --git a/include/JavaObject/type/ITypeCodeParser.h b/include/JavaObject/type/ITypeCodeParser.h
@@ -35,7 +35,7 @@ namespace javaobject::type {
         std::shared_ptr<T> readAsUsingParser(const ParserT &parser) {
             return std::static_pointer_cast<T>(this->readUsingParser(parser));
         }
-        
+
         ParserT *getParser(const TypeCodeT typeCode) {
             if (const auto it = m_parsers.find(typeCode); it != this->m_parsers.end()) {
                 return it->second.get();
diff --git a/include/JavaObject/type/object/ObjectTypeCodeParser.h b/include/JavaObject/type/object/ObjectTypeCodeParser.h
@@ -13,7 +13,6 @@
 #include "JavaObject/type/ITypeCodeParser.h"
 #include "JavaObject/type/object/parsers/IObjectParser.h"
 #include "JavaObject/type/object/parsers/ReferenceParser.h"
-#include "JavaObject/type/primitive/PrimitiveTypeCodeParser.h"
 #include "JavaObject/util/SmartPointerCast.h"
 #include "types/ReferenceObject.h"
 
@@ -23,22 +22,19 @@
 #include <unordered_map>
 #include <variant>
 
+#include "JavaObject/type/ITypeCodeStorageHolder.h"
+
 namespace javaobject::type::primitive {
     class PrimitiveTypeCodeParser;
 }
 
 namespace javaobject::type::object {
-    class ObjectTypeCodeParser : public ITypeCodeParser<IObject, parsers::IObjectParser, EObjectTypeCode> {
+    class ObjectTypeCodeParser : public ITypeCodeParser<IObject, parsers::IObjectParser, EObjectTypeCode>, public ITypeCodeStorageHolder {
     public:
-        explicit ObjectTypeCodeParser(std::istream &input, HandleContainer &handleContainer);
+        explicit ObjectTypeCodeParser(std::istream &input, HandleContainer &handleContainer, TypeCodeParserStorage &parserStorage);
 
         std::shared_ptr<object::IObject> readNext() override;
         std::shared_ptr<object::IObject> readUsingParser(const object::parsers::IObjectParser &parser) override;
-
-        primitive::PrimitiveTypeCodeParser &primitiveTypeCodeParser();
-
-    private:
-        primitive::PrimitiveTypeCodeParser m_primitiveParser;
     };
 } // namespace javaobject::type
 
diff --git a/include/JavaObject/type/primitive/PrimitiveTypeCodeParser.h b/include/JavaObject/type/primitive/PrimitiveTypeCodeParser.h
@@ -17,10 +17,19 @@
 #include "JavaObject/type/primitive/parsers/IPrimitiveObjectParser.h"
 #include "JavaObject/type/primitive/types/IPrimitiveObject.h"
 
+#include <memory>
+
+#include "JavaObject/type/ITypeCodeStorageHolder.h"
+#include "JavaObject/type/TypeCodeParserStorage.h"
+
+namespace javaobject::type::object {
+    class ObjectTypeCodeParser;
+}
+
 namespace javaobject::type::primitive {
-    class PrimitiveTypeCodeParser : public ITypeCodeParser<types::IPrimitiveObject, parsers::IPrimitiveObjectParser, EPrimitiveTypeCode> {
+    class PrimitiveTypeCodeParser : public ITypeCodeParser<types::IPrimitiveObject, parsers::IPrimitiveObjectParser, EPrimitiveTypeCode>, public ITypeCodeStorageHolder {
     public:
-        explicit PrimitiveTypeCodeParser(std::istream &input, HandleContainer &handleContainer);
+        PrimitiveTypeCodeParser(std::istream &input, HandleContainer &handleContainer, TypeCodeParserStorage &parserStorage);
 
         std::shared_ptr<types::IPrimitiveObject> readNext() override;
         std::shared_ptr<types::IPrimitiveObject> readUsingParser(const parsers::IPrimitiveObjectParser &parser) override;
diff --git a/include/JavaObject/type/primitive/types/PrimitiveJavaObject.h b/include/JavaObject/type/primitive/types/PrimitiveJavaObject.h
@@ -10,10 +10,14 @@
  */
 #ifndef JAVAOBJECTSTREAMS_PRIMITIVEJAVAOBJECT_H
 #define JAVAOBJECTSTREAMS_PRIMITIVEJAVAOBJECT_H
+#include "JavaObject/type/object/types/IObject.h"
 #include "JavaObject/type/primitive/types/IPrimitiveObject.h"
+#include <memory>
 
 namespace javaobject::type::primitive::types {
-    struct PrimitiveJavaObject : IPrimitiveObject {
+    struct PrimitiveJavaObject : IPrimitiveTypeObject<std::shared_ptr<object::IObject>> {
+        explicit PrimitiveJavaObject(const std::shared_ptr<object::IObject> &obj) : IPrimitiveTypeObject(obj) {}
+
         EPrimitiveTypeCode typeCode() override;
     };
 } // namespace javaobject::type::primitive::types
diff --git a/src/stream/ObjectInputStream.cpp b/src/stream/ObjectInputStream.cpp
@@ -11,9 +11,12 @@
 #include "JavaObject/stream/ObjectInputStream.h"
 
 #include "JavaObject/type/object/types/NullObject.h"
+#include "JavaObject/type/primitive/PrimitiveTypeCodeParser.h"
 
 namespace javaobject::stream {
-    ObjectInputStream::ObjectInputStream(std::istream &input) : m_handleContainer(), m_input(input), m_stream(input), m_parser(input, m_handleContainer) {
+    ObjectInputStream::ObjectInputStream(std::istream &input) : m_handleContainer(), m_input(input), m_stream(input) {
+        this->m_parsers.objectParser = std::make_shared<type::object::ObjectTypeCodeParser>(input, m_handleContainer, m_parsers);
+        this->m_parsers.primitiveParser = std::make_shared<type::primitive::PrimitiveTypeCodeParser>(input, m_handleContainer, m_parsers);
     }
 
     std::shared_ptr<type::object::IObject> ObjectInputStream::readObject() {
@@ -24,6 +27,6 @@ namespace javaobject::stream {
 
         int16_t count = this->m_stream.readBE<uint16_t>();
 
-        return this->m_parser.readNext();
+        return this->m_parsers.objectParser->readNext();
     }
 } // namespace javaobject::stream
diff --git a/src/type/object/ObjectTypeCodeParser.cpp b/src/type/object/ObjectTypeCodeParser.cpp
@@ -6,6 +6,7 @@
  * @device zPc-i2
  */
 #include "JavaObject/type/object/ObjectTypeCodeParser.h"
+#include "JavaObject/type/primitive/PrimitiveTypeCodeParser.h"
 
 #include "JavaObject/type/object/types/NullObject.h"
 #include "JavaObject/type/object/parsers/ObjectParser.h"
@@ -17,7 +18,7 @@
 #include <istream>
 
 namespace javaobject::type::object {
-    ObjectTypeCodeParser::ObjectTypeCodeParser(std::istream &input, HandleContainer &handleContainer) : ITypeCodeParser(input, handleContainer), m_primitiveParser(input, handleContainer) {
+    ObjectTypeCodeParser::ObjectTypeCodeParser(std::istream &input, HandleContainer &handleContainer, TypeCodeParserStorage &parserStorage) : ITypeCodeParser(input, handleContainer), ITypeCodeStorageHolder(parserStorage) {
         this->m_parsers[EObjectTypeCode::TC_STRING] = std::make_unique<object::parsers::StringParser>();
         this->m_parsers[EObjectTypeCode::TC_OBJECT] = std::make_unique<object::parsers::ObjectParser>();
         this->m_parsers[EObjectTypeCode::TC_CLASSDESC] = std::make_unique<object::parsers::descriptor::ClassDescriptorParser>();
@@ -34,8 +35,7 @@ namespace javaobject::type::object {
         return std::make_shared<object::NullObject>();
     }
 
-    std::shared_ptr<object::IObject> ObjectTypeCodeParser::readUsingParser(const object::parsers::IObjectParser &parser) { return parser(*this); }
-    primitive::PrimitiveTypeCodeParser &ObjectTypeCodeParser::primitiveTypeCodeParser() {
-        return this->m_primitiveParser;
+    std::shared_ptr<object::IObject> ObjectTypeCodeParser::readUsingParser(const object::parsers::IObjectParser &parser) {
+        return parser(*this);
     }
 } // namespace javaobject::type
diff --git a/src/type/object/parsers/ClassDataParser.cpp b/src/type/object/parsers/ClassDataParser.cpp
@@ -16,6 +16,8 @@
 
 #include <assert.h>
 
+#include "JavaObject/type/primitive/PrimitiveTypeCodeParser.h"
+
 namespace javaobject::type::object::parsers {
     ClassDataParser::ClassDataParser(const std::shared_ptr<object::descriptor::ClassDescriptorInfoObject> &classDescInfo) : m_classDescInfo(classDescInfo) {
         // this->m_parsers = {{
@@ -46,11 +48,15 @@ namespace javaobject::type::object::parsers {
     std::shared_ptr<object::SerializableClassDataObject> ClassDataParser::parseSerializableClassData(type::object::ObjectTypeCodeParser &parser) const {
         auto d = std::make_shared<object::SerializableClassDataObject>();
 
+        auto primitiveParser = parser.parserStorage().primitiveParser;
+
         // BUG WORKAROUND, REMOVE AFTER WE FIND THE FIX
         parser.stream().seekRelative(-2);
         for (auto &[name, value] : this->m_classDescInfo->fields) {
             const auto typeCode = value->primitiveDescriptor->typeCode;
-            std::shared_ptr<primitive::types::IPrimitiveObject> obj = (*parser.primitiveTypeCodeParser().getParser(typeCode))(parser.primitiveTypeCodeParser());
+
+            //todo check this out since I can't easily see whats going on when using codewithme
+            std::shared_ptr<primitive::types::IPrimitiveObject> obj = primitiveParser->readUsingParser(*primitiveParser->getParser(typeCode));
 
             d->values.emplace(name, obj);
         }
diff --git a/src/type/primitive/PrimitiveTypeCodeParser.cpp b/src/type/primitive/PrimitiveTypeCodeParser.cpp
@@ -10,17 +10,20 @@
  */
 #include "JavaObject/type/primitive/PrimitiveTypeCodeParser.h"
 
+#include "JavaObject/type/object/ObjectTypeCodeParser.h"
 #include "JavaObject/type/primitive/parsers/PrimitiveBooleanObjectParser.h"
 #include "JavaObject/type/primitive/parsers/PrimitiveByteObjectParser.h"
 #include "JavaObject/type/primitive/parsers/PrimitiveCharObjectParser.h"
 #include "JavaObject/type/primitive/parsers/PrimitiveDoubleObjectParser.h"
 #include "JavaObject/type/primitive/parsers/PrimitiveFloatObjectParser.h"
 #include "JavaObject/type/primitive/parsers/PrimitiveIntegerObjectParser.h"
+#include "JavaObject/type/primitive/parsers/PrimitiveJavaObjectParser.h"
 #include "JavaObject/type/primitive/parsers/PrimitiveLongObjectParser.h"
 #include "JavaObject/type/primitive/parsers/PrimitiveShortObjectParser.h"
 
 namespace javaobject::type::primitive {
-    PrimitiveTypeCodeParser::PrimitiveTypeCodeParser(std::istream &input, HandleContainer &handleContainer) : ITypeCodeParser(input, handleContainer) {
+    PrimitiveTypeCodeParser::PrimitiveTypeCodeParser(std::istream &input, HandleContainer &handleContainer,
+        TypeCodeParserStorage &parserStorage) : ITypeCodeParser(input, handleContainer), ITypeCodeStorageHolder(parserStorage) {
         this->m_parsers[EPrimitiveTypeCode::TYPE_BOOLEAN] = std::make_unique<parsers::PrimitiveBooleanObjectParser>();
         this->m_parsers[EPrimitiveTypeCode::TYPE_BYTE] = std::make_unique<parsers::PrimitiveByteObjectParser>();
         this->m_parsers[EPrimitiveTypeCode::TYPE_CHARACTER] = std::make_unique<parsers::PrimitiveCharObjectParser>();
@@ -30,8 +33,7 @@ namespace javaobject::type::primitive {
         this->m_parsers[EPrimitiveTypeCode::TYPE_LONG] = std::make_unique<parsers::PrimitiveLongObjectParser>();
         this->m_parsers[EPrimitiveTypeCode::TYPE_SHORT] = std::make_unique<parsers::PrimitiveShortObjectParser>();
         // this->m_parsers[EPrimitiveTypeCode::TYPE_ARRAY] = std::make_unique<parsers::PrimitiveByteObjectParser>();
-        // this->m_parsers[EPrimitiveTypeCode::TYPE_OBJECT] = std::make_unique<parsers::PrimitiveByteObjectParser>();
-
+        this->m_parsers[EPrimitiveTypeCode::TYPE_OBJECT] = std::make_unique<parsers::PrimitiveJavaObjectParser>();
     }
 
     std::shared_ptr<types::IPrimitiveObject> PrimitiveTypeCodeParser::readNext() {
@@ -44,5 +46,9 @@ namespace javaobject::type::primitive {
         // return std::make_shared<object::NullObject>();
         throw std::runtime_error("Couldn't find parser for primitive typecode");
     }
-    std::shared_ptr<types::IPrimitiveObject> PrimitiveTypeCodeParser::readUsingParser(const parsers::IPrimitiveObjectParser &parser)  { return parser(*this); }
-} // namespace javaobject::type::primitive
+
+    std::shared_ptr<types::IPrimitiveObject> PrimitiveTypeCodeParser::readUsingParser(
+        const parsers::IPrimitiveObjectParser &parser) {
+        return parser(*this);
+    }
+} // namespace javaobject::type::primitive

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ namespace javaobject::type {`
`35`	`35`	`std::shared_ptr<T> readAsUsingParser(const ParserT &parser) {`
`36`	`36`	`return std::static_pointer_cast<T>(this->readUsingParser(parser));`
`37`	`37`	`}`
`38`		`-`
	`38`	`+`
`39`	`39`	`ParserT *getParser(const TypeCodeT typeCode) {`
`40`	`40`	`if (const auto it = m_parsers.find(typeCode); it != this->m_parsers.end()) {`
`41`	`41`	`return it->second.get();`