feat: deserialize TC_EXCEPTION, TC_CLASS, and properly handle TC_RESET

Author: DexrnZacAttack

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION VERSION 3.30)
-project(JavaObjectStreams VERSION 1.3.7)
+project(JavaObjectStreams VERSION 1.3.8)
 
 set(CMAKE_CXX_STANDARD 20)
 
@@ -139,6 +139,14 @@ set(FILES
         include/JavaObject/type/object/types/descriptor/NewClassDescriptorObject.h
         src/type/object/parsers/ArrayObjectParser.cpp
         include/JavaObject/type/object/parsers/ArrayObjectParser.h
+        include/JavaObject/type/object/types/ResetObject.h
+        src/type/object/types/ResetObject.cpp
+        include/JavaObject/type/object/parsers/ResetObjectParser.h
+        src/type/object/parsers/ResetObjectParser.cpp
+        include/JavaObject/type/object/parsers/ExceptionObjectParser.h
+        src/type/object/parsers/ExceptionObjectParser.cpp
+        include/JavaObject/type/object/parsers/ClassObjectParser.h
+        src/type/object/parsers/ClassObjectParser.cpp
 )
 
 add_library(JavaObjectStreams SHARED ${FILES})

include/JavaObject/type/HandleContainer.h

@@ -28,6 +28,9 @@ namespace javaobject::type {
         std::shared_ptr<object::IObject> resolveReference(const object::ReferenceObject *reference);
         std::shared_ptr<object::IObject> resolveReference(const std::shared_ptr<object::ReferenceObject> &reference);
 
+        /** TC_RESET requires reset of all handles */
+        void reset();
+
     protected:
         static constexpr size_t getIndex(const object::ReferenceObject::handle_t handle) {
             return handle & ~HANDLE_START;

include/JavaObject/type/object/parsers/ClassObjectParser.h

@@ -0,0 +1,21 @@
+/** @file ClassObjectParser.h
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/28/26
+ * 
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#ifndef JAVAOBJECTSTREAMS_CLASSOBJECTPARSER_H
+#define JAVAOBJECTSTREAMS_CLASSOBJECTPARSER_H
+#include "JavaObject/type/object/parsers/IObjectParser.h"
+
+namespace javaobject::type::object::parsers {
+    struct ClassObjectParser : public IObjectParser {
+        std::shared_ptr<object::IObject> operator()(type::object::ObjectTypeCodeParser &parser) const override;
+    };
+} // namespace javaobject::type::object::parsers
+
+#endif //JAVAOBJECTSTREAMS_CLASSOBJECTPARSER_H

include/JavaObject/type/object/parsers/ExceptionObjectParser.h

@@ -0,0 +1,21 @@
+/** @file ExceptionObjectParser.h
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/28/26
+ * 
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#ifndef JAVAOBJECTSTREAMS_EXCEPTIONOBJECTPARSER_H
+#define JAVAOBJECTSTREAMS_EXCEPTIONOBJECTPARSER_H
+#include "JavaObject/type/object/parsers/IObjectParser.h"
+
+namespace javaobject::type::object::parsers {
+    struct ExceptionObjectParser : public IObjectParser {
+        std::shared_ptr<object::IObject> operator()(type::object::ObjectTypeCodeParser &parser) const override;
+    };
+} // namespace javaobject::type::object::parsers
+
+#endif //JAVAOBJECTSTREAMS_EXCEPTIONOBJECTPARSER_H

include/JavaObject/type/object/parsers/ResetObjectParser.h

@@ -0,0 +1,21 @@
+/** @file ResetObjectParser.h
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/28/26
+ * 
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#ifndef JAVAOBJECTSTREAMS_RESETOBJECTPARSER_H
+#define JAVAOBJECTSTREAMS_RESETOBJECTPARSER_H
+#include "JavaObject/type/object/parsers/IObjectParser.h"
+
+namespace javaobject::type::object::parsers {
+    struct ResetObjectParser : public IObjectParser {
+        std::shared_ptr<object::IObject> operator()(type::object::ObjectTypeCodeParser &parser) const override;
+    };
+} // namespace javaobject::type::object::parsers
+
+#endif //JAVAOBJECTSTREAMS_RESETOBJECTPARSER_H

include/JavaObject/type/object/types/ResetObject.h

@@ -0,0 +1,21 @@
+/** @file ResetObject.h
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/28/26
+ * 
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#ifndef JAVAOBJECTSTREAMS_RESETOBJECT_H
+#define JAVAOBJECTSTREAMS_RESETOBJECT_H
+#include "JavaObject/type/object/types/IObject.h"
+
+namespace javaobject::type::object::types {
+    struct ResetObject : public IObject {
+        std::string toString() override;
+    };
+} // namespace javaobject::type::object
+
+#endif //JAVAOBJECTSTREAMS_RESETOBJECT_H

src/type/HandleContainer.cpp

@@ -40,4 +40,8 @@ namespace javaobject::type {
     std::shared_ptr<object::IObject> HandleContainer::resolveReference(const std::shared_ptr<object::ReferenceObject> &reference) {
         return this->resolveReference(reference.get());
     }
-}
+    // TODO or maybe reset should just increment the base and we count from there, would prevent references from being nuked
+    void HandleContainer::reset() {
+        this->m_handles.clear();
+    }
+} // namespace javaobject::type

src/type/object/ObjectTypeCodeParser.cpp

@@ -8,6 +8,7 @@
 #include "JavaObject/type/object/ObjectTypeCodeParser.h"
 
 #include "JavaObject/type/object/parsers/ArrayObjectParser.h"
+#include "JavaObject/type/object/parsers/ClassObjectParser.h"
 
 #include <cassert>
 #include <format>
@@ -23,21 +24,26 @@
 #include <istream>
 
 #include "JavaObject/type/object/parsers/EndBlockDataObjectParser.h"
+#include "JavaObject/type/object/parsers/ExceptionObjectParser.h"
 #include "JavaObject/type/object/parsers/LongBlockDataObjectParser.h"
 #include "JavaObject/type/object/parsers/NullObjectParser.h"
+#include "JavaObject/type/object/parsers/ResetObjectParser.h"
 #include "JavaObject/type/object/parsers/ShortBlockDataObjectParser.h"
 
 namespace javaobject::type::object {
     ObjectTypeCodeParser::ObjectTypeCodeParser(std::istream &input, HandleContainer &handleContainer, TypeCodeParserStorage &parserStorage) : ITypeCodeParser(input, handleContainer), ITypeCodeParserStorageHolder(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::NewClassDescriptorParser>();
+        this->m_parsers[EObjectTypeCode::TC_CLASS] = std::make_unique<object::parsers::ClassObjectParser>();
         this->m_parsers[EObjectTypeCode::TC_REFERENCE] = std::make_unique<object::parsers::ReferenceParser>();
         this->m_parsers[EObjectTypeCode::TC_ENDBLOCKDATA] = std::make_unique<object::parsers::EndBlockDataObjectParser>();
         this->m_parsers[EObjectTypeCode::TC_BLOCKDATA] = std::make_unique<object::parsers::ShortBlockDataObjectParser>();
         this->m_parsers[EObjectTypeCode::TC_BLOCKDATALONG] = std::make_unique<object::parsers::LongBlockDataObjectParser>();
         this->m_parsers[EObjectTypeCode::TC_NULL] = std::make_unique<parsers::NullObjectParser>();
         this->m_parsers[EObjectTypeCode::TC_ARRAY] = std::make_unique<parsers::ArrayObjectParser>();
+        this->m_parsers[EObjectTypeCode::TC_RESET] = std::make_unique<parsers::ResetObjectParser>();
+        this->m_parsers[EObjectTypeCode::TC_EXCEPTION] = std::make_unique<parsers::ExceptionObjectParser>();
     }
 
     std::shared_ptr<IObject> ObjectTypeCodeParser::readUsingTypeCode(const EObjectTypeCode &typecode) {

src/type/object/parsers/ClassObjectParser.cpp

@@ -0,0 +1,22 @@
+/** @file ClassObjectParser.cpp
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/28/26
+ * 
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#include "JavaObject/type/object/parsers/ClassObjectParser.h"
+
+#include "JavaObject/type/object/ObjectTypeCodeParser.h"
+
+namespace javaobject::type::object::parsers {
+    std::shared_ptr<object::IObject> ClassObjectParser::operator()(type::object::ObjectTypeCodeParser &parser) const {
+        std::shared_ptr<object::IObject> desc = parser.readNext();
+        parser.handleContainer().registerHandle(desc);
+
+        return desc;
+    }
+} // namespace javaobject::type::object::parsers

src/type/object/parsers/ExceptionObjectParser.cpp

@@ -0,0 +1,25 @@
+/** @file ExceptionObjectParser.cpp
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/28/26
+ * 
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#include "JavaObject/type/object/parsers/ExceptionObjectParser.h"
+
+#include "JavaObject/type/object/ObjectTypeCodeParser.h"
+
+namespace javaobject::type::object::parsers {
+    std::shared_ptr<object::IObject> ExceptionObjectParser::operator()(type::object::ObjectTypeCodeParser &parser) const {
+        parser.handleContainer().reset();
+
+        std::shared_ptr<IObject> ex = parser.readNext();
+
+        parser.handleContainer().reset();
+
+        return ex;
+    }
+} // namespace javaobject::type::object::parsers