react-native-nitro-net 0.4.1 → 0.4.3

package/nitrogen/generated/ios/swift/HybridNetSocketDriverSpec_cxx.swift

@@ -2,10 +2,9 @@
 /// HybridNetSocketDriverSpec_cxx.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**
@@ -96,6 +95,14 @@ open class HybridNetSocketDriverSpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridNetSocketDriverSpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
@@ -194,7 +201,14 @@ open class HybridNetSocketDriverSpec_cxx {
         } else {
           return nil
         }
-      }(), secureContextId: secureContextId.value)
+      }(), secureContextId: { () -> Double? in
+        if bridge.has_value_std__optional_double_(secureContextId) {
+          let __unwrapped = bridge.get_std__optional_double_(secureContextId)
+          return __unwrapped
+        } else {
+          return nil
+        }
+      }())
       return bridge.create_Result_void_()
     } catch (let __error) {
       let __exceptionPtr = __error.toCpp()
@@ -422,7 +436,14 @@ open class HybridNetSocketDriverSpec_cxx {
         } else {
           return nil
         }
-      }(), secureContextId: secureContextId.value)
+      }(), secureContextId: { () -> Double? in
+        if bridge.has_value_std__optional_double_(secureContextId) {
+          let __unwrapped = bridge.get_std__optional_double_(secureContextId)
+          return __unwrapped
+        } else {
+          return nil
+        }
+      }())
       return bridge.create_Result_void_()
     } catch (let __error) {
       let __exceptionPtr = __error.toCpp()

package/nitrogen/generated/ios/swift/NetConfig.swift

@@ -2,10 +2,9 @@
 /// NetConfig.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**
@@ -37,7 +36,14 @@ public extension NetConfig {
 
   @inline(__always)
   var workerThreads: Double? {
-    return self.__workerThreads.value
+    return { () -> Double? in
+      if bridge.has_value_std__optional_double_(self.__workerThreads) {
+        let __unwrapped = bridge.get_std__optional_double_(self.__workerThreads)
+        return __unwrapped
+      } else {
+        return nil
+      }
+    }()
   }
   
   @inline(__always)

package/nitrogen/generated/shared/c++/HttpParsedMessage.hpp

@@ -0,0 +1,89 @@
+///
+/// HttpParsedMessage.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/JSIHelpers.hpp>)
+#include <NitroModules/JSIHelpers.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+
+
+#include <string>
+#include <NitroModules/ArrayBuffer.hpp>
+#include <optional>
+
+namespace margelo::nitro::net {
+
+  /**
+   * A struct which can be represented as a JavaScript object (HttpParsedMessage).
+   */
+  struct HttpParsedMessage final {
+  public:
+    std::string metadata     SWIFT_PRIVATE;
+    std::optional<std::shared_ptr<ArrayBuffer>> body     SWIFT_PRIVATE;
+
+  public:
+    HttpParsedMessage() = default;
+    explicit HttpParsedMessage(std::string metadata, std::optional<std::shared_ptr<ArrayBuffer>> body): metadata(metadata), body(body) {}
+
+  public:
+    friend bool operator==(const HttpParsedMessage& lhs, const HttpParsedMessage& rhs) = default;
+  };
+
+} // namespace margelo::nitro::net
+
+namespace margelo::nitro {
+
+  // C++ HttpParsedMessage <> JS HttpParsedMessage (object)
+  template <>
+  struct JSIConverter<margelo::nitro::net::HttpParsedMessage> final {
+    static inline margelo::nitro::net::HttpParsedMessage fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::net::HttpParsedMessage(
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "metadata"))),
+        JSIConverter<std::optional<std::shared_ptr<ArrayBuffer>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "body")))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::net::HttpParsedMessage& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "metadata"), JSIConverter<std::string>::toJSI(runtime, arg.metadata));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "body"), JSIConverter<std::optional<std::shared_ptr<ArrayBuffer>>>::toJSI(runtime, arg.body));
+      return obj;
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isObject()) {
+        return false;
+      }
+      jsi::Object obj = value.getObject(runtime);
+      if (!nitro::isPlainObject(runtime, obj)) {
+        return false;
+      }
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "metadata")))) return false;
+      if (!JSIConverter<std::optional<std::shared_ptr<ArrayBuffer>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "body")))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

package/nitrogen/generated/shared/c++/HybridHttpParserSpec.cpp

@@ -2,7 +2,7 @@
 /// HybridHttpParserSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridHttpParserSpec.hpp"

package/nitrogen/generated/shared/c++/HybridHttpParserSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridHttpParserSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -13,9 +13,10 @@
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
 
+// Forward declaration of `HttpParsedMessage` to properly resolve imports.
+namespace margelo::nitro::net { struct HttpParsedMessage; }
 
-
-#include <string>
+#include "HttpParsedMessage.hpp"
 #include <NitroModules/ArrayBuffer.hpp>
 
 namespace margelo::nitro::net {
@@ -49,7 +50,7 @@ namespace margelo::nitro::net {
 
     public:
       // Methods
-      virtual std::string feed(const std::shared_ptr<ArrayBuffer>& data) = 0;
+      virtual HttpParsedMessage feed(const std::shared_ptr<ArrayBuffer>& data) = 0;
 
     protected:
       // Hybrid Setup

package/nitrogen/generated/shared/c++/HybridNetDriverSpec.cpp

@@ -2,7 +2,7 @@
 /// HybridNetDriverSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridNetDriverSpec.hpp"

package/nitrogen/generated/shared/c++/HybridNetDriverSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridNetDriverSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/shared/c++/HybridNetServerDriverSpec.cpp

@@ -2,7 +2,7 @@
 /// HybridNetServerDriverSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridNetServerDriverSpec.hpp"

package/nitrogen/generated/shared/c++/HybridNetServerDriverSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridNetServerDriverSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/shared/c++/HybridNetSocketDriverSpec.cpp

@@ -2,7 +2,7 @@
 /// HybridNetSocketDriverSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridNetSocketDriverSpec.hpp"

package/nitrogen/generated/shared/c++/HybridNetSocketDriverSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridNetSocketDriverSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/shared/c++/HybridNitroBufferSpec.cpp

@@ -2,7 +2,7 @@
 /// HybridNitroBufferSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridNitroBufferSpec.hpp"

package/nitrogen/generated/shared/c++/HybridNitroBufferSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridNitroBufferSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/shared/c++/NetConfig.hpp

@@ -2,7 +2,7 @@
 /// NetConfig.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "react-native-nitro-net",
     "description": "Ultra-high-performance networking to React Native by combining a memory-safe Rust core with the zero-overhead Nitro Modules JSI bridge. Provides Node.js-compatible net, tls, http(s) API.",
-    "version": "0.4.1",
+    "version": "0.4.3",
     "type": "module",
     "main": "./lib/index.js",
     "module": "./lib/index.js",
@@ -27,7 +27,7 @@
     },
     "scripts": {
         "one": "yarn copy-clib && yarn build && yarn pack",
-        "build": "npx nitrogen@0.32.0 && tsc",
+        "build": "npx nitrogen@0.35.0 && tsc",
         "prepare": "npm run build",
         "copy-clib": "npm run copy-clib-android && npm run copy-clib-ios && npm run copy-clib-mac",
         "copy-clib-android": "mkdir -p android/libs/arm64-v8a android/libs/armeabi-v7a android/libs/x86 android/libs/x86_64 && cp ../rust_c_net/target/aarch64-linux-android/release/librust_c_net.so android/libs/arm64-v8a/ && cp ../rust_c_net/target/armv7-linux-androideabi/release/librust_c_net.so android/libs/armeabi-v7a/ && cp ../rust_c_net/target/i686-linux-android/release/librust_c_net.so android/libs/x86/ && cp ../rust_c_net/target/x86_64-linux-android/release/librust_c_net.so android/libs/x86_64/ && cp ../rust_c_net/include/NetBindings.hpp cpp/",
@@ -42,13 +42,12 @@
     "devDependencies": {
         "@types/node": "*",
         "@types/readable-stream": "^4.0.23",
-        "nitrogen": "^0.32.0",
-        "react-native-nitro-modules": "^0.32.0",
+        "react-native-nitro-modules": "0.35.0",
         "typescript": "^5.3.3"
     },
     "peerDependencies": {
         "react-native": "*",
-        "react-native-nitro-modules": "^0.32.0"
+        "react-native-nitro-modules": "0.35.0"
     },
     "packageManager": "yarn@4.12.0",
     "files": [

package/src/Logger.ts

@@ -0,0 +1,31 @@
+/**
+ * Global verbosity state for debugging.
+ */
+let _isVerbose = false;
+
+/**
+ * Checks if verbose debugging is enabled.
+ */
+export function isVerbose(): boolean {
+    return _isVerbose;
+}
+
+/**
+ * Enables or disables verbose debugging.
+ */
+export function setVerbose(enabled: boolean): void {
+    _isVerbose = enabled;
+}
+
+/**
+ * Logs a debug message with a timestamp and tag if verbosity is enabled.
+ * 
+ * @param tag The tag to identify the source (e.g., 'HTTP', 'NET', 'TLS')
+ * @param message The message to log
+ */
+export function debugLog(tag: string, message: string) {
+    if (_isVerbose) {
+        const timestamp = new Date().toISOString().split('T')[1].split('Z')[0];
+        console.log(`[${tag} DEBUG ${timestamp}] ${message}`);
+    }
+}

package/src/Net.nitro.ts

@@ -82,14 +82,18 @@ export interface NetServerDriver extends HybridObject<{ ios: 'swift', android: '
     maxConnections: number
     close(): void
 }
+export interface HttpParsedMessage {
+    metadata: string
+    body?: ArrayBuffer
+}
 
 export interface HttpParser extends HybridObject<{ ios: 'swift', android: 'kotlin' }> {
     /**
      * Feed data to the parser
      * @param data Raw byte data from the network
-     * @returns JSON string of the parsed message if complete, empty string if partial, or error message starting with 'ERROR:'
+     * @returns HttpParsedMessage containing the JSON metadata and optional binary body
      */
-    feed(data: ArrayBuffer): string
+    feed(data: ArrayBuffer): HttpParsedMessage
 }
 
 /**

package/src/http.ts

@@ -1,15 +1,14 @@
 import { Writable, Readable } from 'readable-stream'
 import { EventEmitter } from 'eventemitter3'
+import { Buffer } from 'react-native-nitro-buffer'
+
 import { Driver } from './Driver'
-import { Socket, isVerbose } from './net'
+import { Socket } from './net'
 import { TLSSocket } from './tls'
-import { Buffer } from 'react-native-nitro-buffer'
+import { debugLog as loggerDebugLog } from './Logger'
 
 function debugLog(message: string) {
-    if (isVerbose()) {
-        const timestamp = new Date().toISOString().split('T')[1].split('Z')[0];
-        debugLog(`[HTTP DEBUG ${timestamp}] ${message}`);
-    }
+    loggerDebugLog('HTTP', message)
 }
 
 // ========== STATUS_CODES ==========
@@ -146,9 +145,6 @@ export class OutgoingMessage extends Writable {
     constructor() {
         // @ts-ignore - disable autoDestroy to prevent socket from being destroyed when stream ends
         super({ autoDestroy: false });
-        this.once('finish', () => {
-            this.emit('close');
-        });
     }
 
     public destroy(error?: Error): this {
@@ -320,6 +316,16 @@ export class ServerResponse extends OutgoingMessage {
     constructor(socket: Socket) {
         super();
         this.socket = socket;
+
+        const onClose = () => {
+            if (this.socket) {
+                this.socket.removeListener('close', onClose);
+            }
+            this.removeListener('finish', onClose);
+            this.emit('close');
+        };
+        this.once('finish', onClose);
+        this.socket.once('close', onClose);
     }
 
     writeHead(statusCode: number, statusMessage?: string | Record<string, any>, headers?: Record<string, any>): this {
@@ -469,14 +475,18 @@ export class Server extends EventEmitter {
         }
 
         const onData = (data: Buffer) => {
-            const handleParsedResult = (result: string) => {
-                if (result.startsWith('ERROR:')) {
+            const handleParsedResult = (result: any) => {
+                const metadata = result.metadata;
+                if (metadata.startsWith('ERROR:')) {
                     if (headersTimer) clearTimeout(headersTimer);
-                    this.emit('error', new Error(result));
+                    this.emit('error', new Error(metadata));
                     socket.destroy();
                     return;
                 }
-                const parsed = JSON.parse(result);
+                const parsed = JSON.parse(metadata);
+                if (result.body) {
+                    parsed.body = Buffer.from(result.body);
+                }
 
                 if (parsed.is_headers) {
                     if (headersTimer) {
@@ -568,14 +578,15 @@ export class Server extends EventEmitter {
 
             let input: ArrayBuffer = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
             let iterations = 0;
-            const maxIterations = 100; // Safety limit
+            const maxIterations = 2000; // Safety limit
             while (iterations < maxIterations) {
                 iterations++;
                 const result = parser.feed(input);
-                if (!result || result === '' || result.startsWith('ERROR:')) {
+                const metadata = result.metadata;
+                if (!metadata || metadata === '' || metadata.startsWith('ERROR:')) {
                     // Empty result (partial) or error - exit loop
-                    if (result && result.startsWith('ERROR:')) {
-                        debugLog(`[HTTP] Server: Parser error: ${result}`);
+                    if (metadata && metadata.startsWith('ERROR:')) {
+                        debugLog(`[HTTP] Server: Parser error: ${metadata}`);
                     }
                     break;
                 }
@@ -1026,13 +1037,17 @@ export class ClientRequest extends OutgoingMessage {
         const parser = Driver.createHttpParser(1); // 1 = Response mode
 
         const onData = (data: Buffer) => {
-            const handleParsedResult = (result: string) => {
-                if (result.startsWith('ERROR:')) {
-                    this.emit('error', new Error(result));
+            const handleParsedResult = (result: any) => {
+                const metadata = result.metadata;
+                if (metadata.startsWith('ERROR:')) {
+                    this.emit('error', new Error(metadata));
                     this.socket!.destroy();
                     return;
                 }
-                const parsed = JSON.parse(result);
+                const parsed = JSON.parse(metadata);
+                if (result.body) {
+                    parsed.body = Buffer.from(result.body);
+                }
                 debugLog(`[HTTP] _connect: Parser result: ${parsed.is_headers ? 'HEADERS' : 'DATA'}${parsed.complete ? ' (COMPLETE)' : ''}`);
 
                 if (parsed.is_headers) {
@@ -1098,14 +1113,15 @@ export class ClientRequest extends OutgoingMessage {
 
             let input: ArrayBuffer = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
             let iterations = 0;
-            const maxIterations = 100; // Safety limit
+            const maxIterations = 2000; // Safety limit
             while (iterations < maxIterations) {
                 iterations++;
                 const result = parser.feed(input);
-                if (!result || result === '' || result.startsWith('ERROR:')) {
+                const metadata = result.metadata;
+                if (!metadata || metadata === '' || metadata.startsWith('ERROR:')) {
                     // Empty result (partial) or error - exit loop
-                    if (result && result.startsWith('ERROR:')) {
-                        debugLog(`[HTTP] ClientRequest: Parser error: ${result}`);
+                    if (metadata && metadata.startsWith('ERROR:')) {
+                        debugLog(`[HTTP] ClientRequest: Parser error: ${metadata}`);
                     }
                     break;
                 }
@@ -1152,6 +1168,7 @@ export class ClientRequest extends OutgoingMessage {
         const socket = this.socket;
         this._cleanupSocket();
         if (socket) agent.releaseSocket(socket, this._options);
+        this.emit('close');
     }
 
     private _flushPendingWrites() {

package/src/net.ts

@@ -1,9 +1,11 @@
 import { Duplex, DuplexOptions } from 'readable-stream'
 import { EventEmitter } from 'eventemitter3'
+import { Buffer } from 'react-native-nitro-buffer'
+
 import { Driver } from './Driver'
 import type { NetSocketDriver, NetServerDriver, NetConfig } from './Net.nitro'
 import { NetSocketEvent, NetServerEvent } from './Net.nitro'
-import { Buffer } from 'react-native-nitro-buffer'
+import { isVerbose, setVerbose, debugLog as loggerDebugLog } from './Logger'
 
 // -----------------------------------------------------------------------------
 // Utils
@@ -25,27 +27,29 @@ function isIPv4(input: string): boolean {
 function isIPv6(input: string): boolean {
     return isIP(input) === 6;
 }
+
+/**
+ * Decodes an ArrayBuffer to a string.
+ * Prioritizes TextDecoder if available, otherwise falls back to Buffer.
+ */
+function decodeArrayBuffer(data: ArrayBuffer | undefined): string {
+    if (!data || data.byteLength === 0) return '';
+    if (typeof TextDecoder !== 'undefined') {
+        return new TextDecoder().decode(data);
+    }
+    return Buffer.from(data).toString();
+}
 // -----------------------------------------------------------------------------
 // Global Configuration
 // -----------------------------------------------------------------------------
 
 let _autoSelectFamilyDefault = 4; // Node default is usually 4/6 independent, but we mock it.
-let _isVerbose = false;
 let _isInitialized = false;
 
-function isVerbose(): boolean {
-    return _isVerbose;
-}
 
-function setVerbose(enabled: boolean): void {
-    _isVerbose = enabled;
-}
 
 function debugLog(message: string) {
-    if (_isVerbose) {
-        const timestamp = new Date().toISOString().split('T')[1].split('Z')[0];
-        console.log(`[NET DEBUG ${timestamp}] ${message}`);
-    }
+    loggerDebugLog('NET', message)
 }
 
 function getDefaultAutoSelectFamily(): number {
@@ -343,9 +347,6 @@ export class Socket extends Duplex {
             // resume() will be called after 'connect' event in _connect()
         }
 
-        this.on('finish', () => {
-            // Writable side finished
-        });
     }
 
     on(event: string | symbol, listener: (...args: any[]) => void): this {
@@ -366,11 +367,11 @@ export class Socket extends Duplex {
         const id = (this._driver as any).id ?? (this._driver as any)._id;
         this._driver.onEvent = (eventType: number, data: ArrayBuffer) => {
             this.emit('event', eventType, data);
-            if (eventType === 3) { // ERROR
-                const msg = new TextDecoder().decode(data);
+            if (eventType === NetSocketEvent.ERROR) {
+                const msg = decodeArrayBuffer(data) || 'Unknown error';
                 debugLog(`Socket (id: ${id}) NATIVE ERROR: ${msg}`);
             }
-            if (eventType === 9) { // SESSION/DEBUG
+            if (eventType === NetSocketEvent.SESSION) { // SESSION/DEBUG
                 debugLog(`Socket (id: ${id}) NATIVE SESSION EVENT RECEIVED`);
                 this.emit('session', data);
                 return;
@@ -398,7 +399,7 @@ export class Socket extends Duplex {
                     break;
                 case NetSocketEvent.ERROR: {
                     this._hadError = true;
-                    const errorMsg = data ? Buffer.from(data).toString() : 'Unknown socket error';
+                    const errorMsg = decodeArrayBuffer(data) || 'Unknown socket error';
                     const error = new Error(errorMsg);
 
                     if (this.connecting && this._autoSelectFamily) {
@@ -439,7 +440,7 @@ export class Socket extends Duplex {
                     break;
                 case NetSocketEvent.LOOKUP: {
                     if (data) {
-                        const lookupStr = Buffer.from(data).toString();
+                        const lookupStr = decodeArrayBuffer(data);
                         const parts = lookupStr.split(',');
                         if (parts.length >= 2) {
                             const [ip, family] = parts;
@@ -778,7 +779,7 @@ export class Server extends EventEmitter {
         this._driver.onEvent = (eventType: number, data: ArrayBuffer) => {
             switch (eventType) {
                 case NetServerEvent.CONNECTION: {
-                    const payload = data ? Buffer.from(data).toString() : '';
+                    const payload = decodeArrayBuffer(data);
                     if (payload === 'success') {
                         this.emit('listening');
                     } else {
@@ -836,7 +837,7 @@ export class Server extends EventEmitter {
                     break;
                 }
                 case NetServerEvent.ERROR:
-                    this.emit('error', new Error(data ? Buffer.from(data).toString() : 'Unknown server error'));
+                    this.emit('error', new Error(decodeArrayBuffer(data) || 'Unknown server error'));
                     break;
                 case NetServerEvent.DEBUG: {
                     debugLog(`Server NATIVE SESSION/DEBUG EVENT RECEIVED`);