From c1ae46fc66cb4fe13b25e1dd61f056ae7ea89cc9 Mon Sep 17 00:00:00 2001
From: Joseph Doherty <dohejw01@gmail.com>
Date: Sat, 28 Feb 2026 06:33:09 -0500
Subject: [PATCH] feat(batch1): add mapped proto scan helpers with boundary
 tests

---
 .../Internal/ProtoWire.cs                     |  30 +++++++
 .../Internal/ProtoWireTests.cs                |  77 ++++++++++++++++++
 porting.db                                    | Bin 6352896 -> 6352896 bytes
 reports/current.md                            |   8 +-
 reports/report_d8d71ea.md                     |  37 +++++++++
 5 files changed, 148 insertions(+), 4 deletions(-)
 create mode 100644 dotnet/tests/ZB.MOM.NatsNet.Server.Tests/Internal/ProtoWireTests.cs
 create mode 100644 reports/report_d8d71ea.md

diff --git a/dotnet/src/ZB.MOM.NatsNet.Server/Internal/ProtoWire.cs b/dotnet/src/ZB.MOM.NatsNet.Server/Internal/ProtoWire.cs
index 22eaff2..035e0c4 100644
--- a/dotnet/src/ZB.MOM.NatsNet.Server/Internal/ProtoWire.cs
+++ b/dotnet/src/ZB.MOM.NatsNet.Server/Internal/ProtoWire.cs
@@ -51,6 +51,12 @@ public static class ProtoWire
         return (num, typ, sizeTag + sizeValue, null);
     }
 
+    /// <summary>
+    /// Compatibility mapped entrypoint for PortTracker: <c>protoScanField</c>.
+    /// </summary>
+    public static (int num, int typ, int size, Exception? err) ProtoScanField(ReadOnlySpan<byte> b)
+        => ScanField(b);
+
     /// <summary>
     /// Reads a protobuf tag varint and returns field number, wire type, and bytes consumed.
     /// Mirrors <c>protoScanTag</c>.
@@ -71,6 +77,12 @@ public static class ProtoWire
         return (num, typ, size, null);
     }
 
+    /// <summary>
+    /// Compatibility mapped entrypoint for PortTracker: <c>protoScanTag</c>.
+    /// </summary>
+    public static (int num, int typ, int size, Exception? err) ProtoScanTag(ReadOnlySpan<byte> b)
+        => ScanTag(b);
+
     /// <summary>
     /// Returns the byte count consumed by a field value with the given wire type.
     /// Mirrors <c>protoScanFieldValue</c>.
@@ -98,6 +110,12 @@ public static class ProtoWire
         }
     }
 
+    /// <summary>
+    /// Compatibility mapped entrypoint for PortTracker: <c>protoScanFieldValue</c>.
+    /// </summary>
+    public static (int size, Exception? err) ProtoScanFieldValue(int typ, ReadOnlySpan<byte> b)
+        => ScanFieldValue(typ, b);
+
     // -------------------------------------------------------------------------
     // Varint decode
     // -------------------------------------------------------------------------
@@ -170,6 +188,12 @@ public static class ProtoWire
         return (0, 0, ErrOverflow);
     }
 
+    /// <summary>
+    /// Compatibility mapped entrypoint for PortTracker: <c>protoScanVarint</c>.
+    /// </summary>
+    public static (ulong v, int size, Exception? err) ProtoScanVarint(ReadOnlySpan<byte> b)
+        => ScanVarint(b);
+
     // -------------------------------------------------------------------------
     // Length-delimited decode
     // -------------------------------------------------------------------------
@@ -190,6 +214,12 @@ public static class ProtoWire
         return (lenSize + (int)l, null);
     }
 
+    /// <summary>
+    /// Compatibility mapped entrypoint for PortTracker: <c>protoScanBytes</c>.
+    /// </summary>
+    public static (int size, Exception? err) ProtoScanBytes(ReadOnlySpan<byte> b)
+        => ScanBytes(b);
+
     // -------------------------------------------------------------------------
     // Varint encode
     // -------------------------------------------------------------------------
diff --git a/dotnet/tests/ZB.MOM.NatsNet.Server.Tests/Internal/ProtoWireTests.cs b/dotnet/tests/ZB.MOM.NatsNet.Server.Tests/Internal/ProtoWireTests.cs
new file mode 100644
index 0000000..45b5048
--- /dev/null
+++ b/dotnet/tests/ZB.MOM.NatsNet.Server.Tests/Internal/ProtoWireTests.cs
@@ -0,0 +1,77 @@
+// Copyright 2012-2025 The NATS Authors
+// Licensed under the Apache License, Version 2.0
+
+using Shouldly;
+using ZB.MOM.NatsNet.Server.Internal;
+
+namespace ZB.MOM.NatsNet.Server.Tests.Internal;
+
+public class ProtoWireTests
+{
+    [Fact]
+    public void ProtoScanTag_ValidTag_ReturnsFieldTypeAndSize()
+    {
+        var (num, typ, size, err) = ProtoWire.ProtoScanTag([0x7A]); // field=15, type=2
+
+        err.ShouldBeNull();
+        num.ShouldBe(15);
+        typ.ShouldBe(2);
+        size.ShouldBe(1);
+    }
+
+    [Fact]
+    public void ProtoScanTag_InvalidFieldNumber_ReturnsError()
+    {
+        var (_, _, _, err) = ProtoWire.ProtoScanTag([0x02]); // field=0, type=2
+
+        err.ShouldNotBeNull();
+        err.Message.ShouldContain("invalid field number");
+    }
+
+    [Fact]
+    public void ProtoScanFieldValue_UnsupportedWireType_ReturnsError()
+    {
+        var (_, err) = ProtoWire.ProtoScanFieldValue(3, [0x01]);
+
+        err.ShouldNotBeNull();
+        err.Message.ShouldContain("unsupported type");
+    }
+
+    [Fact]
+    public void ProtoScanVarint_InsufficientData_ReturnsError()
+    {
+        var (_, _, err) = ProtoWire.ProtoScanVarint([0x80]);
+
+        err.ShouldNotBeNull();
+        err.Message.ShouldContain("insufficient data");
+    }
+
+    [Fact]
+    public void ProtoScanVarint_Overflow_ReturnsError()
+    {
+        var (_, _, err) = ProtoWire.ProtoScanVarint([0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x02]);
+
+        err.ShouldNotBeNull();
+        err.Message.ShouldContain("too much data");
+    }
+
+    [Fact]
+    public void ProtoScanBytes_LengthDelimited_ReturnsLengthPrefixPlusPayloadSize()
+    {
+        var (size, err) = ProtoWire.ProtoScanBytes([0x03, (byte)'a', (byte)'b', (byte)'c']);
+
+        err.ShouldBeNull();
+        size.ShouldBe(4);
+    }
+
+    [Fact]
+    public void ProtoScanField_ValidLengthDelimited_ReturnsTotalFieldSize()
+    {
+        var (num, typ, size, err) = ProtoWire.ProtoScanField([0x0A, 0x03, (byte)'a', (byte)'b', (byte)'c']); // field=1,type=2
+
+        err.ShouldBeNull();
+        num.ShouldBe(1);
+        typ.ShouldBe(2);
+        size.ShouldBe(5);
+    }
+}
diff --git a/porting.db b/porting.db
index 5cda9e2a044d2cb37fd4f14c633ba681b47dcfac..3e27d6e2160bbfddd1957fac1a6b2c3304567edf 100644
GIT binary patch
delta 1969
zcmciATWDK#90%}o$w`xwoRjprx;7^#IZ2ya+g!RX%Q{=TwqED5bz9xEYHUs~x+XD6
z)rW!&1M|><9RvR$sI5#?7;PTZ^VV6x4F-EqQDnXhFE4^a)EA+O-^P(8kk>7T5B$E#
z`SJVn`)B#qId&OJYkl<PbL)NDdLP~WDZ@Lo>p#<5TvT9f%yfDob5_l(yxVl0@>P-x
zsk4$4B(aj5+ULL0qhs_hgbOn7XqSUbm^SctKIB%0Y0-WUF<%&TroSkWNITX&+Km{~
zO%GBOHJ(&w)NEEw@@}MPCApA%m82kbR+1A*)PjS|B~>qewEJi`*BRa%HnOcuF2DE!
z?-t*nJmt!TN-9?hs+Mx)M8%gYN3m^#0ak0<(EahU)AX5%GSBj-jLU`&PS($IKUiMU
z6~!COzx0=)LVKtS<k((%mIVFW5NYyTY-F{U<47RD3FKWrXD9Z6z;TgqED|Nx{M=!Z
z)mOdKTlKScLFV4$i^%{7dT0Ox7-9E&6PQ5&QA-9aYd`7!WJHP#$E~vFv08^|p6zG5
z*mjm@cF0_#b&1?=w7yEeO>R$E-;eR`-P?Rc&CbuvW4o@Jq|_v5O>z`Rnyt_XP0$Q2
z&<bs^2ioBQ*b5!d2{vt{S-N`OMgK!jQCBRd#cg5B{DJ8^{*vxBHo<&sylL1mC=KKK
zQ7*o_#fzkELmDN=FS2*GxU?ZvZ-{)dA&n8oZ-PwT^m7*C*_51B3nV8tr6c6)ZPVR5
zXd>TkN{*^`v@2`Ur0~`%t1IeC64*fo2RK0i7r3Ddy1@fp@PQu!&;z~D2SEry7$VRQ
z`(Oa}Llh1`3=YB|9D)a72!`Py7=gnu3S%%155ptyC_Dy_!xL}>o`j<ihhuOYCg22|
zgi|mHPr+$815babD?O9(H8We3rBy5ne+v<F*7S{Oh+i_6jDq3ChHDKjeSzENXx%XT
zI<uwGKQgOKd*RSZfTwJXZP8W;MP}4Qele@&csEI;LIG<$o6e^v=d)_>bS@SS2Z_Zu
zHD}xX*GJIkuhZzN(-=C?U)$)b)2P&I3=NbUJO7_JxZ*80=4y^gzB+iO$5M0BXr#8y
zQ?D&#pXwm1-o~cd-hKP4&uU-kF83a7EhyF7DSXd($+CY+SV-jO(<wQZPh|6IGA1XI
z$@$c*ypYIb)TCTK)x>ln<&ziG{9HPjlM|_=oL6)CoSad!a^`Fz6%K|6dV=Aea8wS3
zVv$fR*k7=(bk&*bBKLl-yUtwYKFoF1nd`g{bCo)C9e3xRyeIctEP1EkS$Iw>d7qD8
F{SP%vU|0YE

delta 908
zcmX}oT}YEr9LMqJb=$K&dwiTa)7s-UO<kEzr=_N8rdes`TUq8C<@BOLGa~{oY(hhN
zK`T5E2yQo`lsxpp0fUS#3M4P0An3|6C`3%UDhTYiGC6$Ue9t*I|1-Ea#1Dc#k;R6G
zLRmDF#il*wjFirQVV{fnvdWg7?YYo<-rw(+9;0$M>k%q-v!<-PgWIfO`eK<auV9yn
z=;g+V*QLhN2VO3nC7*ja8(quhUYZ1kVHBeMR^#bHA(zII;-6{*tt{eh`3;8Y$f6%Z
zoLSE4^7r-mJFU8Mohj<{Z`3p@Gg1;C$6e~be8x!s@1)_NeTD;`+Gm6x7v1K7^hWNM
z+@@;7SAIqG36oLh_y%Qxoo7asWXo%dm((S)-R3~vy(AmMW(PbZ`i2}!mt5jCGZ}S?
zB_!}ra1dumvypYDm_*h_cnk5k#4>WnA#PmUcZn{d`yAF_cZLWCFoFprFoOkTh`do~
zcSh9slCa7t3@NQuoitrlOIgwvtqzdH4$e&sHnp8yB&!YTw_r_-3ejML7>I>9utPj-
zfdoi|t*{Lov?fNIy_pi#s60{Z)*ktT<-Pftv|^g&ZnIaIIpdnqW+)I_gl4`g@&|Y6
zR9I`WlDP@3oP<YBe@FBE8@DZlv-(fT8{@tWX>Q^jS7fpt(yB<fT}~q3ouW#vhP70p
zCh+F55nc!ix&}$$1Q)m=8B$<7q(T~`g9moNPRM{=kO^7fg>1+HALK$F?1nv%4+T&N
zd!Y!5VIP!0DeQ+bH~{5P0SBQH4#8nK0##5AN1+CeK`qolJv2Zg9ETIo1SjDXG{fmh
tL2v1`OOnn+#VJASFRM@Pv%IsEm<J@Cx@ud;q@eC;g*IrXx~HS|)gLB~FNpvE

diff --git a/reports/current.md b/reports/current.md
index 04536ed..13ed1a8 100644
--- a/reports/current.md
+++ b/reports/current.md
@@ -1,6 +1,6 @@
 # NATS .NET Porting Status Report
 
-Generated: 2026-02-28 11:30:24 UTC
+Generated: 2026-02-28 11:33:10 UTC
 
 ## Modules (12 total)
 
@@ -12,10 +12,10 @@ Generated: 2026-02-28 11:30:24 UTC
 
 | Status | Count |
 |--------|-------|
-| deferred | 2373 |
+| deferred | 2368 |
 | n_a | 24 |
 | stub | 1 |
-| verified | 1275 |
+| verified | 1280 |
 
 ## Unit Tests (3257 total)
 
@@ -34,4 +34,4 @@ Generated: 2026-02-28 11:30:24 UTC
 
 ## Overall Progress
 
-**2477/6942 items complete (35.7%)**
+**2482/6942 items complete (35.8%)**
diff --git a/reports/report_d8d71ea.md b/reports/report_d8d71ea.md
new file mode 100644
index 0000000..13ed1a8
--- /dev/null
+++ b/reports/report_d8d71ea.md
@@ -0,0 +1,37 @@
+# NATS .NET Porting Status Report
+
+Generated: 2026-02-28 11:33:10 UTC
+
+## Modules (12 total)
+
+| Status | Count |
+|--------|-------|
+| verified | 12 |
+
+## Features (3673 total)
+
+| Status | Count |
+|--------|-------|
+| deferred | 2368 |
+| n_a | 24 |
+| stub | 1 |
+| verified | 1280 |
+
+## Unit Tests (3257 total)
+
+| Status | Count |
+|--------|-------|
+| deferred | 2091 |
+| n_a | 187 |
+| verified | 979 |
+
+## Library Mappings (36 total)
+
+| Status | Count |
+|--------|-------|
+| mapped | 36 |
+
+
+## Overall Progress
+
+**2482/6942 items complete (35.8%)**