support OSC 1.0 TCP format if SLIP is not enabled

rework send string
prevent parsing empty byte slice
2026-08-04 14:57:45 +00:00 · 2026-01-28 14:37:23 -06:00 · 2026-01-28 14:36:59 -06:00 · 2026-01-28 14:34:52 -06:00 · 2026-01-28 14:26:26 -06:00 · 2026-01-19 03:08:19 +00:00
5 changed files with 19 additions and 12 deletions
@@ -2,6 +2,7 @@ package main

 import (
 	"context"
+	"encoding/binary"
 	"encoding/hex"
 	"fmt"
 	"net"
@@ -211,6 +212,12 @@ func send(host string, port int32, address string, args []string, types []string

 	if slip {
 		oscMessageBuffer = slipEncode(oscMessageBuffer)
+	} else if protocol == "tcp" {
+		// OSC 1.0 prepends a 4 byte size header for non-SLIP TCP messages
+		size := uint32(len(oscMessageBuffer))
+		sizeBytes := make([]byte, 4)
+		binary.BigEndian.PutUint32(sizeBytes, size)
+		oscMessageBuffer = append(sizeBytes, oscMessageBuffer...)
 	}

 	netAddress := fmt.Sprintf("%s:%d", host, port)
@@ -2,4 +2,4 @@ module github.com/jwetzell/osc-go

 go 1.25.1

-require github.com/urfave/cli/v3 v3.6.1
+require github.com/urfave/cli/v3 v3.6.2
@@ -4,7 +4,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/urfave/cli/v3 v3.6.1 h1:j8Qq8NyUawj/7rTYdBGrxcH7A/j7/G8Q5LhWEW4G3Mo=
-github.com/urfave/cli/v3 v3.6.1/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso=
+github.com/urfave/cli/v3 v3.6.2 h1:lQuqiPrZ1cIz8hz+HcrG0TNZFxU70dPZ3Yl+pSrH9A8=
+github.com/urfave/cli/v3 v3.6.2/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -26,6 +26,10 @@ func (m *OSCMessage) ToBytes() []byte {
 }

 func MessageFromBytes(bytes []byte) (OSCMessage, error) {
+	if len(bytes) == 0 {
+		return OSCMessage{}, errors.New("cannot create OSC Message from empty byte array")
+	}
+
 	address, typeAndArgBytes := readOSCString(bytes)

 	if address[0] != 47 {
@@ -174,17 +174,13 @@ func argsToBuffer(args []OSCArg) []byte {
 func readOSCString(bytes []byte) (string, []byte) {
 	//TODO(jwetzell): add error handling
 	oscString := ""
-	stringFinished := false
 	stringEndIndex := 0
-	remainingBytes := []byte{}

 	for index, byteIn := range bytes {
-		if !stringFinished {
-			if byteIn == 0 {
-				oscString = string(bytes[0:index])
-				stringEndIndex = index + 1
-				break
-			}
+		if byteIn == 0 {
+			oscString = string(bytes[0:index])
+			stringEndIndex = index + 1
+			break
 		}
 	}

@@ -194,7 +190,7 @@ func readOSCString(bytes []byte) (string, []byte) {
 		stringEndIndex = stringEndIndex + stringPadding
 	}

-	remainingBytes = bytes[stringEndIndex:]
+	remainingBytes := bytes[stringEndIndex:]

 	return oscString, remainingBytes
 }
Author	SHA1	Message	Date
Joel Wetzell	d7c6da5c5b	support OSC 1.0 TCP format if SLIP is not enabled	2026-01-28 14:37:23 -06:00
Joel Wetzell	6f3a65322b	rework send string	2026-01-28 14:36:59 -06:00
Joel Wetzell	e34a589c5f	prevent parsing empty byte slice	2026-01-28 14:34:52 -06:00
Joel Wetzell	41112d583b	Merge pull request #13 from jwetzell/dependabot/go_modules/github.com/urfave/cli/v3-3.6.2 Bump github.com/urfave/cli/v3 from 3.6.1 to 3.6.2	2026-01-28 14:26:26 -06:00
dependabot[bot]	24a0501a4d	Bump github.com/urfave/cli/v3 from 3.6.1 to 3.6.2 Bumps [github.com/urfave/cli/v3](https://github.com/urfave/cli) from 3.6.1 to 3.6.2. - [Release notes](https://github.com/urfave/cli/releases) - [Changelog](https://github.com/urfave/cli/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/urfave/cli/compare/v3.6.1...v3.6.2) --- updated-dependencies: - dependency-name: github.com/urfave/cli/v3 dependency-version: 3.6.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-01-19 03:08:19 +00:00