v1.0.3

FIXED: * Link in README * ReadConnResponse was not properly reading in the response status byte before checking the checksum, leading to receiving/parsing Response messages from a net.Conn *always* failing with an errs.ErrBadHdr. This has been rectified.
fix readme link to module
2025-09-30 14:15:00 -04:00 · 2025-09-24 17:00:17 -04:00 · 2025-08-28 01:26:04 -04:00
8 changed files with 109 additions and 15 deletions
--- a/.githooks/pre-commit/01-docgen
+++ b/.githooks/pre-commit/01-docgen
@@ -15,5 +15,10 @@ for f in $(find . -maxdepth 1 -type f -iname "*.adoc"); do

 	asciidoctor -o "${docsdir}/${nosuffix}.html" "${f}"
 	git add "${docsdir}/${nosuffix}.html"
+	if command -v pandoc &> /dev/null;
+	then
+		asciidoctor -b docbook -o - "${f}" | pandoc -f docbook -t markdown_strict -o "${docsdir}/${nosuffix}.md"
+		git add "${docsdir}/${nosuffix}.md"
+	fi
 done
 echo "Regenerated docs"
--- a/README.adoc
+++ b/README.adoc
@@ -23,12 +23,12 @@ Last rendered {localdatetime}

 [id="ref"]
 == Reference
-In addition to the documentation found in this document and https://wireproto.io/[the specification^], library usage documentation can be found at https://pkg.go.dev/go.pkg.dev/r00t2.io/WireProto[the Golang module documentation page^]:
+In addition to the documentation found in this document and https://wireproto.io/[the specification^], library usage documentation can be found at https://pkg.go.dev/r00t2.io/wireproto[the Golang module documentation page^]:

 ++++
-<a href="https://pkg.go.dev/go.pkg.dev/r00t2.io/wireproto">
-    <img src="https://pkg.go.dev/badge/go.pkg.dev/r00t2.io/wireproto.svg"
-         alt="Go Reference">
+<a href="https://go.pkg.dev/r00t2.io/wireproto">
+    <img src="https://pkg.go.dev/badge/r00t2.io/wireproto.svg"
+         alt="Go Reference"/>
 </a>
 ++++

@@ -57,3 +57,6 @@ The following are a wishlist or things planned that may come in later versions.
 ** This of course won't work for serializing and keeping *order* of children (e.g. RG => Record); that'd still need to be ordered, but it will allow for parallel parsing *of* those children. Should benchmark, though; it may not be worth it.
 * `context.Context` support for `Read*` and `Write*` funcs
 ** This is a relatively low priority as the passed `net.Conn` will likely return an error if its own context is canceled. This can be handled in the caller downstream.
+* `.Append*()` methods to append any type to any parent type. e.g. `<Response>.AppendFVP(<FieldValuePair>)` would append an FVP to the most recent ResponseRecord to the most recent ResponseRecordGroup (or create if they don't exist), `<Response>.AppendRecord(...)` for appending a record to most recent record group etc.
+* Better/more strict interfaces
+* Maps should be `any`, not `interface{}` values
--- a/README.html
+++ b/README.html
@@ -476,6 +476,10 @@ pre.rouge .gi {
  color: #116329;
  background-color: #dafbe1;
 }
+pre.rouge .ges {
+  font-weight: bold;
+  font-style: italic;
+}
 pre.rouge .kc {
  color: #0550ae;
 }
@@ -555,7 +559,7 @@ pre.rouge .gs {
 <div class="details">
 <span id="author" class="author">Brent Saner</span><br>
 <span id="email" class="email"><a href="mailto:bts@square-r00t.net">bts@square-r00t.net</a></span><br>
-<span id="revdate">Last rendered 2024-07-10 00:40:13 -0400</span>
+<span id="revdate">Last rendered 2025-09-30 14:15:01 -0400</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -571,11 +575,11 @@ pre.rouge .gs {
 <h2 id="ref"><a class="link" href="#ref">1. Reference</a></h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>In addition to the documentation found in this document and <a href="https://wireproto.io/" target="_blank" rel="noopener">the specification</a>, library usage documentation can be found at <a href="https://pkg.go.dev/go.pkg.dev/r00t2.io/WireProto" target="_blank" rel="noopener">the Golang module documentation page</a>:</p>
+<p>In addition to the documentation found in this document and <a href="https://wireproto.io/" target="_blank" rel="noopener">the specification</a>, library usage documentation can be found at <a href="https://pkg.go.dev/r00t2.io/wireproto" target="_blank" rel="noopener">the Golang module documentation page</a>:</p>
 </div>
-<a href="https://pkg.go.dev/go.pkg.dev/r00t2.io/wireproto">
-    <img src="https://pkg.go.dev/badge/go.pkg.dev/r00t2.io/wireproto.svg"
-         alt="Go Reference">
+<a href="https://go.pkg.dev/r00t2.io/wireproto">
+    <img src="https://pkg.go.dev/badge/r00t2.io/wireproto.svg"
+         alt="Go Reference"/>
 </a>
 </div>
 </div>
@@ -655,6 +659,15 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 </ul>
 </div>
 </li>
+<li>
+<p><code>.Append*()</code> methods to append any type to any parent type. e.g. <code>&lt;Response&gt;.AppendFVP(&lt;FieldValuePair&gt;)</code> would append an FVP to the most recent ResponseRecord to the most recent ResponseRecordGroup (or create if they don&#8217;t exist), <code>&lt;Response&gt;.AppendRecord(&#8230;&#8203;)</code> for appending a record to most recent record group etc.</p>
+</li>
+<li>
+<p>Better/more strict interfaces</p>
+</li>
+<li>
+<p>Maps should be <code>any</code>, not <code>interface{}</code> values</p>
+</li>
 </ul>
 </div>
 </div>
@@ -662,7 +675,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-07-10 00:21:48 -0400
+Last updated 2025-09-25 17:54:36 -0400
 </div>
 </div>
 </body>
--- a/README.md
+++ b/README.md
@@ -0,0 +1,63 @@
+# Reference
+
+In addition to the documentation found in this document and [the
+specification](https://wireproto.io/), library usage documentation can
+be found at [the Golang module documentation
+page](https://pkg.go.dev/r00t2.io/wireproto):
+
+# License
+
+This library is licensed for use, inclusion, and distribution under the
+["3-Clause BSD" license](https://opensource.org/license/bsd-3-clause).
+
+    Copyright (c) 2024 Brent Saner (r00t^2). 
+
+    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+    3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# TODO
+
+The following are a wishlist or things planned that may come in later
+versions.
+
+-   More clear errors
+
+    -   Currently during e.g. `UnmarshalBinary` calls, just an `io.EOF`
+        will be returned if the buffer is exhausted early. This may be
+        able to be a little more context-helpful by using the `Err*`
+        errors.
+
+-   Confirmation of read/write sizes in buffers
+
+    -   The sizes they **should** be are known, there’s no reason to not
+        confirm it.
+
+-   Goroutines
+
+    -   This of course won’t work for serializing and keeping **order**
+        of children (e.g. RG ⇒ Record); that’d still need to be ordered,
+        but it will allow for parallel parsing **of** those children.
+        Should benchmark, though; it may not be worth it.
+
+-   `context.Context` support for `Read*` and `Write*` funcs
+
+    -   This is a relatively low priority as the passed `net.Conn` will
+        likely return an error if its own context is canceled. This can
+        be handled in the caller downstream.
+
+-   `.Append*()` methods to append any type to any parent type. e.g.
+    `<Response>.AppendFVP(<FieldValuePair>)` would append an FVP to the
+    most recent ResponseRecord to the most recent ResponseRecordGroup
+    (or create if they don’t exist), `<Response>.AppendRecord(…)` for
+    appending a record to most recent record group etc.
+
+-   Better/more strict interfaces
+
+-   Maps should be `any`, not `interface{}` values
--- a/doc.go
+++ b/doc.go
@@ -5,7 +5,5 @@
 For more details and the actual specification, visit [WireProto].

 [WireProto]: https://wireproto.io/
-
-
 */
 package wireproto
--- a/funcs.go
+++ b/funcs.go
@@ -92,7 +92,15 @@ func ReadConnResponse(conn net.Conn) (resp *Response, err error) {
 	var size int
 	var buf *bytes.Buffer = new(bytes.Buffer)

-	// First get the checksum.
+	// Buffer in the status byte...
+	b = make([]byte, 1)
+	if _, err = conn.Read(b); err != nil {
+		return
+	}
+	if _, err = buf.Write(b); err != nil {
+		return
+	}
+	// Then get the checksum. Per spec, *all* responses *must* have a checksum.
 	b = make([]byte, len(hdrCKSUM))
 	if _, err = conn.Read(b); err != nil {
 		return
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,10 @@
 module r00t2.io/wireproto

-go 1.23
+go 1.24.5
+
+toolchain go1.24.6

 require (
 	github.com/google/uuid v1.6.0
-	r00t2.io/goutils v1.7.0
+	r00t2.io/goutils v1.9.6
 )
--- a/go.sum
+++ b/go.sum
@@ -5,4 +5,6 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 r00t2.io/goutils v1.7.0 h1:iQluWlkOyBwOKaK94D5QSnSMYpGKtMb/5WjefmdfHgI=
 r00t2.io/goutils v1.7.0/go.mod h1:9ObJI9S71wDLTOahwoOPs19DhZVYrOh4LEHmQ8SW4Lk=
+r00t2.io/goutils v1.9.6 h1:ZMIIAb16y1AEt1vW1JteHLtblfpnFxyQo2c8AZ3Lf7A=
+r00t2.io/goutils v1.9.6/go.mod h1:76AxpXUeL10uFklxRB11kQsrtj2AKiNm8AwG1bNoBCA=
 r00t2.io/sysutils v1.1.1/go.mod h1:Wlfi1rrJpoKBOjWiYM9rw2FaiZqraD6VpXyiHgoDo/o=