fix: fix PacketAPI

ShrBox · ShrBox · commit 7253349610c6 · 2025-02-27T13:37:50.000+08:00
diff --git a/src/legacy/api/PacketAPI.cpp b/src/legacy/api/PacketAPI.cpp
@@ -116,7 +116,9 @@ Local<Value> BinaryStreamClass::getAndReleaseData() {
         if (!bs) {
             return Local<Value>();
         }
-        return String::newString(stream->getAndReleaseData());
+        std::string data;
+        stream->mBuffer.swap(data);
+        return String::newString(data);
     }
     CATCH("Fail in BinaryStream getData!");
 }
@@ -134,7 +136,7 @@ Local<Value> BinaryStreamClass::reset() {
         if (!stream) {
             return Local<Value>();
         }
-        stream->reset();
+        stream->mBuffer.clear();
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream reset!");
@@ -157,7 +159,7 @@ Local<Value> BinaryStreamClass::writeBool(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeBool(args[0].asBoolean().value());
+        pkt->writeBool(args[0].asBoolean().value(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeBool!");
@@ -171,7 +173,7 @@ Local<Value> BinaryStreamClass::writeByte(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeByte(args[0].asNumber().toInt32());
+        pkt->writeByte(args[0].asNumber().toInt32(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeByte!");
@@ -185,7 +187,7 @@ Local<Value> BinaryStreamClass::writeDouble(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeDouble(args[0].asNumber().toDouble());
+        pkt->writeDouble(args[0].asNumber().toDouble(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeDouble!");
@@ -199,7 +201,7 @@ Local<Value> BinaryStreamClass::writeFloat(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeFloat(args[0].asNumber().toFloat());
+        pkt->writeFloat(args[0].asNumber().toFloat(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeFloat!");
@@ -213,7 +215,7 @@ Local<Value> BinaryStreamClass::writeSignedBigEndianInt(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeSignedBigEndianInt(args[0].asNumber().toInt32());
+        pkt->writeSignedBigEndianInt(args[0].asNumber().toInt32(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeSignedBigEndianInt!");
@@ -227,7 +229,7 @@ Local<Value> BinaryStreamClass::writeSignedInt(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeSignedInt(args[0].asNumber().toInt32());
+        pkt->writeSignedInt(args[0].asNumber().toInt32(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeSignedInt!");
@@ -241,7 +243,7 @@ Local<Value> BinaryStreamClass::writeSignedInt64(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeSignedInt64(args[0].asNumber().toInt64());
+        pkt->writeSignedInt64(args[0].asNumber().toInt64(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeSignedInt64!");
@@ -255,7 +257,7 @@ Local<Value> BinaryStreamClass::writeSignedShort(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeSignedShort(args[0].asNumber().toInt32());
+        pkt->writeSignedShort(args[0].asNumber().toInt32(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeSignedShort!");
@@ -269,7 +271,7 @@ Local<Value> BinaryStreamClass::writeString(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeString(args[0].asString().toString());
+        pkt->writeString(args[0].asString().toString(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeString!");
@@ -283,7 +285,7 @@ Local<Value> BinaryStreamClass::writeUnsignedChar(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeUnsignedChar(args[0].asNumber().toInt32());
+        pkt->writeUnsignedChar(args[0].asNumber().toInt32(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeUnsignedChar!");
@@ -297,7 +299,7 @@ Local<Value> BinaryStreamClass::writeUnsignedInt(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeUnsignedInt((uint32_t)args[0].asNumber().toInt32());
+        pkt->writeUnsignedInt((uint32_t)args[0].asNumber().toInt32(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeUnsignedInt!");
@@ -311,7 +313,7 @@ Local<Value> BinaryStreamClass::writeUnsignedInt64(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeUnsignedInt64((uint64_t)args[0].asNumber().toInt64());
+        pkt->writeUnsignedInt64((uint64_t)args[0].asNumber().toInt64(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeUnsignedInt64!");
@@ -325,7 +327,7 @@ Local<Value> BinaryStreamClass::writeUnsignedShort(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeUnsignedShort((uint16_t)args[0].asNumber().toInt32());
+        pkt->writeUnsignedShort((uint16_t)args[0].asNumber().toInt32(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeUnsignedShort!");
@@ -339,7 +341,7 @@ Local<Value> BinaryStreamClass::writeUnsignedVarInt(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeUnsignedVarInt((uint32_t)args[0].asNumber().toInt32());
+        pkt->writeUnsignedVarInt((uint32_t)args[0].asNumber().toInt32(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeUnsignedVarInt!");
@@ -353,7 +355,7 @@ Local<Value> BinaryStreamClass::writeUnsignedVarInt64(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeUnsignedVarInt64((uint64_t)args[0].asNumber().toInt64());
+        pkt->writeUnsignedVarInt64((uint64_t)args[0].asNumber().toInt64(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeUnsignedVarInt64!");
@@ -367,7 +369,7 @@ Local<Value> BinaryStreamClass::writeVarInt(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeVarInt(args[0].asNumber().toInt32());
+        pkt->writeVarInt(args[0].asNumber().toInt32(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeVarInt!");
@@ -381,7 +383,7 @@ Local<Value> BinaryStreamClass::writeVarInt64(const Arguments& args) {
         if (!pkt) {
             return Local<Value>();
         }
-        pkt->writeVarInt64(args[0].asNumber().toInt64());
+        pkt->writeVarInt64(args[0].asNumber().toInt64(), nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeVarInt64!");
@@ -399,9 +401,9 @@ Local<Value> BinaryStreamClass::writeVec3(const Arguments& args) {
             return Local<Value>();
         }
         FloatPos* posObj = FloatPos::extractPos(args[0]);
-        pkt->writeFloat(posObj->getVec3().x);
-        pkt->writeFloat(posObj->getVec3().y);
-        pkt->writeFloat(posObj->getVec3().z);
+        pkt->writeFloat(posObj->getVec3().x, nullptr, nullptr);
+        pkt->writeFloat(posObj->getVec3().y, nullptr, nullptr);
+        pkt->writeFloat(posObj->getVec3().z, nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeVec3!");
@@ -419,9 +421,9 @@ Local<Value> BinaryStreamClass::writeBlockPos(const Arguments& args) {
             return Local<Value>();
         }
         IntPos* posObj = IntPos::extractPos(args[0]);
-        pkt->writeVarInt(posObj->getBlockPos().x);
-        pkt->writeUnsignedVarInt(posObj->getBlockPos().y);
-        pkt->writeVarInt(posObj->getBlockPos().z);
+        pkt->writeVarInt(posObj->getBlockPos().x, nullptr, nullptr);
+        pkt->writeUnsignedVarInt(posObj->getBlockPos().y, nullptr, nullptr);
+        pkt->writeVarInt(posObj->getBlockPos().z, nullptr, nullptr);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeVec3!");

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,9 @@ Local<Value> BinaryStreamClass::getAndReleaseData() {`
`116`	`116`	`if (!bs) {`
`117`	`117`	`return Local<Value>();`
`118`	`118`	`}`
`119`		`- return String::newString(stream->getAndReleaseData());`
	`119`	`+ std::string data;`
	`120`	`+ stream->mBuffer.swap(data);`
	`121`	`+ return String::newString(data);`
`120`	`122`	`}`
`121`	`123`	`CATCH("Fail in BinaryStream getData!");`
`122`	`124`	`}`
`@@ -134,7 +136,7 @@ Local<Value> BinaryStreamClass::reset() {`
`134`	`136`	`if (!stream) {`
`135`	`137`	`return Local<Value>();`
`136`	`138`	`}`
`137`		`- stream->reset();`
	`139`	`+ stream->mBuffer.clear();`
`138`	`140`	`return Boolean::newBoolean(true);`
`139`	`141`	`}`
`140`	`142`	`CATCH("Fail in BinaryStream reset!");`
`@@ -157,7 +159,7 @@ Local<Value> BinaryStreamClass::writeBool(const Arguments& args) {`
`157`	`159`	`if (!pkt) {`
`158`	`160`	`return Local<Value>();`
`159`	`161`	`}`
`160`		`- pkt->writeBool(args[0].asBoolean().value());`
	`162`	`+ pkt->writeBool(args[0].asBoolean().value(), nullptr, nullptr);`
`161`	`163`	`return Boolean::newBoolean(true);`
`162`	`164`	`}`
`163`	`165`	`CATCH("Fail in BinaryStream writeBool!");`
`@@ -171,7 +173,7 @@ Local<Value> BinaryStreamClass::writeByte(const Arguments& args) {`
`171`	`173`	`if (!pkt) {`
`172`	`174`	`return Local<Value>();`
`173`	`175`	`}`
`174`		`- pkt->writeByte(args[0].asNumber().toInt32());`
	`176`	`+ pkt->writeByte(args[0].asNumber().toInt32(), nullptr, nullptr);`
`175`	`177`	`return Boolean::newBoolean(true);`
`176`	`178`	`}`
`177`	`179`	`CATCH("Fail in BinaryStream writeByte!");`
`@@ -185,7 +187,7 @@ Local<Value> BinaryStreamClass::writeDouble(const Arguments& args) {`
`185`	`187`	`if (!pkt) {`
`186`	`188`	`return Local<Value>();`
`187`	`189`	`}`
`188`		`- pkt->writeDouble(args[0].asNumber().toDouble());`
	`190`	`+ pkt->writeDouble(args[0].asNumber().toDouble(), nullptr, nullptr);`
`189`	`191`	`return Boolean::newBoolean(true);`
`190`	`192`	`}`
`191`	`193`	`CATCH("Fail in BinaryStream writeDouble!");`
`@@ -199,7 +201,7 @@ Local<Value> BinaryStreamClass::writeFloat(const Arguments& args) {`
`199`	`201`	`if (!pkt) {`
`200`	`202`	`return Local<Value>();`
`201`	`203`	`}`
`202`		`- pkt->writeFloat(args[0].asNumber().toFloat());`
	`204`	`+ pkt->writeFloat(args[0].asNumber().toFloat(), nullptr, nullptr);`
`203`	`205`	`return Boolean::newBoolean(true);`
`204`	`206`	`}`
`205`	`207`	`CATCH("Fail in BinaryStream writeFloat!");`
`@@ -213,7 +215,7 @@ Local<Value> BinaryStreamClass::writeSignedBigEndianInt(const Arguments& args) {`
`213`	`215`	`if (!pkt) {`
`214`	`216`	`return Local<Value>();`
`215`	`217`	`}`
`216`		`- pkt->writeSignedBigEndianInt(args[0].asNumber().toInt32());`
	`218`	`+ pkt->writeSignedBigEndianInt(args[0].asNumber().toInt32(), nullptr, nullptr);`
`217`	`219`	`return Boolean::newBoolean(true);`
`218`	`220`	`}`
`219`	`221`	`CATCH("Fail in BinaryStream writeSignedBigEndianInt!");`
`@@ -227,7 +229,7 @@ Local<Value> BinaryStreamClass::writeSignedInt(const Arguments& args) {`
`227`	`229`	`if (!pkt) {`
`228`	`230`	`return Local<Value>();`
`229`	`231`	`}`
`230`		`- pkt->writeSignedInt(args[0].asNumber().toInt32());`
	`232`	`+ pkt->writeSignedInt(args[0].asNumber().toInt32(), nullptr, nullptr);`
`231`	`233`	`return Boolean::newBoolean(true);`
`232`	`234`	`}`
`233`	`235`	`CATCH("Fail in BinaryStream writeSignedInt!");`
`@@ -241,7 +243,7 @@ Local<Value> BinaryStreamClass::writeSignedInt64(const Arguments& args) {`
`241`	`243`	`if (!pkt) {`
`242`	`244`	`return Local<Value>();`
`243`	`245`	`}`
`244`		`- pkt->writeSignedInt64(args[0].asNumber().toInt64());`
	`246`	`+ pkt->writeSignedInt64(args[0].asNumber().toInt64(), nullptr, nullptr);`
`245`	`247`	`return Boolean::newBoolean(true);`
`246`	`248`	`}`
`247`	`249`	`CATCH("Fail in BinaryStream writeSignedInt64!");`
`@@ -255,7 +257,7 @@ Local<Value> BinaryStreamClass::writeSignedShort(const Arguments& args) {`
`255`	`257`	`if (!pkt) {`
`256`	`258`	`return Local<Value>();`
`257`	`259`	`}`
`258`		`- pkt->writeSignedShort(args[0].asNumber().toInt32());`
	`260`	`+ pkt->writeSignedShort(args[0].asNumber().toInt32(), nullptr, nullptr);`
`259`	`261`	`return Boolean::newBoolean(true);`
`260`	`262`	`}`
`261`	`263`	`CATCH("Fail in BinaryStream writeSignedShort!");`
`@@ -269,7 +271,7 @@ Local<Value> BinaryStreamClass::writeString(const Arguments& args) {`
`269`	`271`	`if (!pkt) {`
`270`	`272`	`return Local<Value>();`
`271`	`273`	`}`
`272`		`- pkt->writeString(args[0].asString().toString());`
	`274`	`+ pkt->writeString(args[0].asString().toString(), nullptr, nullptr);`
`273`	`275`	`return Boolean::newBoolean(true);`
`274`	`276`	`}`
`275`	`277`	`CATCH("Fail in BinaryStream writeString!");`
`@@ -283,7 +285,7 @@ Local<Value> BinaryStreamClass::writeUnsignedChar(const Arguments& args) {`
`283`	`285`	`if (!pkt) {`
`284`	`286`	`return Local<Value>();`
`285`	`287`	`}`
`286`		`- pkt->writeUnsignedChar(args[0].asNumber().toInt32());`
	`288`	`+ pkt->writeUnsignedChar(args[0].asNumber().toInt32(), nullptr, nullptr);`
`287`	`289`	`return Boolean::newBoolean(true);`
`288`	`290`	`}`
`289`	`291`	`CATCH("Fail in BinaryStream writeUnsignedChar!");`
`@@ -297,7 +299,7 @@ Local<Value> BinaryStreamClass::writeUnsignedInt(const Arguments& args) {`
`297`	`299`	`if (!pkt) {`
`298`	`300`	`return Local<Value>();`
`299`	`301`	`}`
`300`		`- pkt->writeUnsignedInt((uint32_t)args[0].asNumber().toInt32());`
	`302`	`+ pkt->writeUnsignedInt((uint32_t)args[0].asNumber().toInt32(), nullptr, nullptr);`
`301`	`303`	`return Boolean::newBoolean(true);`
`302`	`304`	`}`
`303`	`305`	`CATCH("Fail in BinaryStream writeUnsignedInt!");`
`@@ -311,7 +313,7 @@ Local<Value> BinaryStreamClass::writeUnsignedInt64(const Arguments& args) {`
`311`	`313`	`if (!pkt) {`
`312`	`314`	`return Local<Value>();`
`313`	`315`	`}`
`314`		`- pkt->writeUnsignedInt64((uint64_t)args[0].asNumber().toInt64());`
	`316`	`+ pkt->writeUnsignedInt64((uint64_t)args[0].asNumber().toInt64(), nullptr, nullptr);`
`315`	`317`	`return Boolean::newBoolean(true);`
`316`	`318`	`}`
`317`	`319`	`CATCH("Fail in BinaryStream writeUnsignedInt64!");`
`@@ -325,7 +327,7 @@ Local<Value> BinaryStreamClass::writeUnsignedShort(const Arguments& args) {`
`325`	`327`	`if (!pkt) {`
`326`	`328`	`return Local<Value>();`
`327`	`329`	`}`
`328`		`- pkt->writeUnsignedShort((uint16_t)args[0].asNumber().toInt32());`
	`330`	`+ pkt->writeUnsignedShort((uint16_t)args[0].asNumber().toInt32(), nullptr, nullptr);`
`329`	`331`	`return Boolean::newBoolean(true);`
`330`	`332`	`}`
`331`	`333`	`CATCH("Fail in BinaryStream writeUnsignedShort!");`
`@@ -339,7 +341,7 @@ Local<Value> BinaryStreamClass::writeUnsignedVarInt(const Arguments& args) {`
`339`	`341`	`if (!pkt) {`
`340`	`342`	`return Local<Value>();`
`341`	`343`	`}`
`342`		`- pkt->writeUnsignedVarInt((uint32_t)args[0].asNumber().toInt32());`
	`344`	`+ pkt->writeUnsignedVarInt((uint32_t)args[0].asNumber().toInt32(), nullptr, nullptr);`
`343`	`345`	`return Boolean::newBoolean(true);`
`344`	`346`	`}`
`345`	`347`	`CATCH("Fail in BinaryStream writeUnsignedVarInt!");`
`@@ -353,7 +355,7 @@ Local<Value> BinaryStreamClass::writeUnsignedVarInt64(const Arguments& args) {`
`353`	`355`	`if (!pkt) {`
`354`	`356`	`return Local<Value>();`
`355`	`357`	`}`
`356`		`- pkt->writeUnsignedVarInt64((uint64_t)args[0].asNumber().toInt64());`
	`358`	`+ pkt->writeUnsignedVarInt64((uint64_t)args[0].asNumber().toInt64(), nullptr, nullptr);`
`357`	`359`	`return Boolean::newBoolean(true);`
`358`	`360`	`}`
`359`	`361`	`CATCH("Fail in BinaryStream writeUnsignedVarInt64!");`
`@@ -367,7 +369,7 @@ Local<Value> BinaryStreamClass::writeVarInt(const Arguments& args) {`
`367`	`369`	`if (!pkt) {`
`368`	`370`	`return Local<Value>();`
`369`	`371`	`}`
`370`		`- pkt->writeVarInt(args[0].asNumber().toInt32());`
	`372`	`+ pkt->writeVarInt(args[0].asNumber().toInt32(), nullptr, nullptr);`
`371`	`373`	`return Boolean::newBoolean(true);`
`372`	`374`	`}`
`373`	`375`	`CATCH("Fail in BinaryStream writeVarInt!");`
`@@ -381,7 +383,7 @@ Local<Value> BinaryStreamClass::writeVarInt64(const Arguments& args) {`
`381`	`383`	`if (!pkt) {`
`382`	`384`	`return Local<Value>();`
`383`	`385`	`}`
`384`		`- pkt->writeVarInt64(args[0].asNumber().toInt64());`
	`386`	`+ pkt->writeVarInt64(args[0].asNumber().toInt64(), nullptr, nullptr);`
`385`	`387`	`return Boolean::newBoolean(true);`
`386`	`388`	`}`
`387`	`389`	`CATCH("Fail in BinaryStream writeVarInt64!");`
`@@ -399,9 +401,9 @@ Local<Value> BinaryStreamClass::writeVec3(const Arguments& args) {`
`399`	`401`	`return Local<Value>();`
`400`	`402`	`}`
`401`	`403`	`FloatPos* posObj = FloatPos::extractPos(args[0]);`
`402`		`- pkt->writeFloat(posObj->getVec3().x);`
`403`		`- pkt->writeFloat(posObj->getVec3().y);`
`404`		`- pkt->writeFloat(posObj->getVec3().z);`
	`404`	`+ pkt->writeFloat(posObj->getVec3().x, nullptr, nullptr);`
	`405`	`+ pkt->writeFloat(posObj->getVec3().y, nullptr, nullptr);`
	`406`	`+ pkt->writeFloat(posObj->getVec3().z, nullptr, nullptr);`
`405`	`407`	`return Boolean::newBoolean(true);`
`406`	`408`	`}`
`407`	`409`	`CATCH("Fail in BinaryStream writeVec3!");`
`@@ -419,9 +421,9 @@ Local<Value> BinaryStreamClass::writeBlockPos(const Arguments& args) {`
`419`	`421`	`return Local<Value>();`
`420`	`422`	`}`
`421`	`423`	`IntPos* posObj = IntPos::extractPos(args[0]);`
`422`		`- pkt->writeVarInt(posObj->getBlockPos().x);`
`423`		`- pkt->writeUnsignedVarInt(posObj->getBlockPos().y);`
`424`		`- pkt->writeVarInt(posObj->getBlockPos().z);`
	`424`	`+ pkt->writeVarInt(posObj->getBlockPos().x, nullptr, nullptr);`
	`425`	`+ pkt->writeUnsignedVarInt(posObj->getBlockPos().y, nullptr, nullptr);`
	`426`	`+ pkt->writeVarInt(posObj->getBlockPos().z, nullptr, nullptr);`
`425`	`427`	`return Boolean::newBoolean(true);`
`426`	`428`	`}`
`427`	`429`	`CATCH("Fail in BinaryStream writeVec3!");`