fix cmd name and description

add json output to receiveosc

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+  - package-ecosystem: gomod
+    directory: /
+    schedule:
+      interval: "weekly"

.github/workflows/release-makeosc.yml

@@ -1,4 +1,4 @@
-name: "release go binaries for multiple os/arch"
+name: "release go binaries for makeosc"
 
 on:
   push:
@@ -36,13 +36,13 @@ jobs:
           - goarch: "386"
             goos: darwin
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: wangyoucao577/go-release-action@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
-          goversion: "1.23.1"
+          goversion: "1.25.1"
           project_path: "./cmd/makeosc"
           binary_name: "makeosc"
           asset_name: makeosc-${{ matrix.goos }}-${{ matrix.goarch }}

.github/workflows/release-receiveosc.yml

@@ -0,0 +1,49 @@
+name: "release go binaries for receiveosc"
+
+on:
+  push:
+    tags:
+      - 'receiveosc/*'
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+
+  create-release:
+    name: Create receiveosc release
+    runs-on: ubuntu-latest 
+    steps:
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: false
+  release-multi:
+    name: create binaries and upload
+    needs: create-release
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        goos: [linux, windows, darwin]
+        goarch: ["386", amd64, arm64]
+        exclude:
+          - goarch: "386"
+            goos: darwin
+    steps:
+      - uses: actions/checkout@v5
+      - uses: wangyoucao577/go-release-action@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          goos: ${{ matrix.goos }}
+          goarch: ${{ matrix.goarch }}
+          goversion: "1.25.1"
+          project_path: "./cmd/receiveosc"
+          binary_name: "receiveosc"
+          asset_name: receiveosc-${{ matrix.goos }}-${{ matrix.goarch }}
+          release_name: ${{github.ref_name}}

.github/workflows/release-sendosc.yml

@@ -1,4 +1,4 @@
-name: "release go binaries for multiple os/arch"
+name: "release go binaries for sendosc"
 
 on:
   push:
@@ -36,13 +36,13 @@ jobs:
           - goarch: "386"
             goos: darwin
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: wangyoucao577/go-release-action@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
-          goversion: "1.23.1"
+          goversion: "1.25.1"
           project_path: "./cmd/sendosc"
           binary_name: "sendosc"
           asset_name: sendosc-${{ matrix.goos }}-${{ matrix.goarch }}

bundle.go

@@ -0,0 +1,95 @@
+package osc
+
+import (
+	"errors"
+)
+
+func (b *OSCBundle) ToBytes() []byte {
+
+	bytes := stringToOSCBytes("#bundle")
+
+	bytes = append(bytes, timeTagToOSCBytes(b.TimeTag)...)
+
+	for _, packet := range b.Contents {
+		packetBytes := packet.ToBytes()
+		packetLength := len(packet.ToBytes())
+
+		bytes = append(bytes, int32ToOSCBytes(int32(packetLength))...)
+		bytes = append(bytes, packetBytes...)
+	}
+
+	return bytes
+}
+
+func BundleFromBytes(bytes []byte) (OSCBundle, []byte, error) {
+	if len(bytes) < 20 {
+		return OSCBundle{}, bytes, errors.New("bundle has to be at least 20 bytes")
+	}
+
+	if bytes[0] != 35 {
+		return OSCBundle{}, bytes, errors.New("bundle must start with a #")
+	}
+
+	bundleHeader, bytesAfterBundleHeader := readOSCString(bytes)
+
+	if bundleHeader != "#bundle" {
+		return OSCBundle{}, bytesAfterBundleHeader, errors.New("bundle must start with #bundle string")
+	}
+
+	timeTag, bytesAfterTimeTag, err := readOSCTimeTag(bytesAfterBundleHeader)
+
+	if err != nil {
+		return OSCBundle{}, bytesAfterBundleHeader, err
+	}
+
+	bundleContents := []OSCPacket{}
+
+	endOfBundle := false
+
+	remainingBytes := bytesAfterTimeTag
+
+	for !endOfBundle {
+		contentSize, bytesAfterContentSize, err := readOSCInt32(remainingBytes)
+
+		if err != nil {
+			return OSCBundle{}, remainingBytes, err
+		}
+
+		remainingBytes = bytesAfterContentSize
+
+		if len(remainingBytes) < int(contentSize) {
+			return OSCBundle{}, remainingBytes, errors.New("bundle doesn't have enough bytes for the content size it specifies")
+		}
+
+		bundleContentBytes := remainingBytes[0:contentSize]
+
+		if bundleContentBytes[0] == 35 {
+			content, _, err := BundleFromBytes(bundleContentBytes)
+			if err != nil {
+				return OSCBundle{}, remainingBytes, err
+			}
+			bundleContents = append(bundleContents, &content)
+		} else if bundleContentBytes[0] == 47 {
+			content, err := MessageFromBytes(bundleContentBytes)
+			if err != nil {
+				return OSCBundle{}, remainingBytes, err
+			}
+			bundleContents = append(bundleContents, &content)
+		} else {
+			return OSCBundle{}, remainingBytes, errors.New("bundle contents does not look a bundle or message")
+		}
+		remainingBytes = bytesAfterContentSize[contentSize:]
+		if len(remainingBytes) == 0 {
+			endOfBundle = true
+		}
+
+	}
+
+	return OSCBundle{
+			TimeTag:  timeTag,
+			Contents: bundleContents,
+		},
+		remainingBytes,
+		nil
+
+}

bundle_test.go

@@ -0,0 +1,89 @@
+package osc
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+)
+
+func TestOSCBundleEncoding(t *testing.T) {
+
+	testCases := []struct {
+		description string
+		bundle      OSCBundle
+		expected    []byte
+	}{
+		{
+			"simple contents single message",
+			OSCBundle{
+				TimeTag: OSCTimeTag{
+					seconds:           32,
+					fractionalSeconds: 0,
+				},
+				Contents: []OSCPacket{&OSCMessage{Address: "/oscillator/4/frequency", Args: []OSCArg{{Type: "f", Value: float32(440)}}}},
+			},
+			[]byte{35, 98, 117, 110, 100, 108, 101, 0, 0, 0, 0,
+				32, 0, 0, 0, 0, 0, 0, 0, 32, 47, 111,
+				115, 99, 105, 108, 108, 97, 116, 111, 114, 47, 52,
+				47, 102, 114, 101, 113, 117, 101, 110, 99, 121, 0,
+				44, 102, 0, 0, 67, 220, 0, 0},
+		},
+	}
+
+	for _, testCase := range testCases {
+
+		actual := testCase.bundle.ToBytes()
+
+		if !reflect.DeepEqual(actual, testCase.expected) {
+			t.Errorf("Test '%s' failed to encode properly", testCase.description)
+			fmt.Printf("expected: %v\n", testCase.expected)
+			fmt.Printf("actual: %v\n", actual)
+		}
+	}
+
+}
+
+func TestOSCBundleDecoding(t *testing.T) {
+	testCases := []struct {
+		description string
+		expected    OSCBundle
+		bytes       []byte
+	}{
+		{
+			"simple contents single message",
+			OSCBundle{
+				TimeTag: OSCTimeTag{
+					seconds:           32,
+					fractionalSeconds: 0,
+				},
+				Contents: []OSCPacket{&OSCMessage{Address: "/oscillator/4/frequency", Args: []OSCArg{{Type: "f", Value: float32(440)}}}},
+			},
+			[]byte{35, 98, 117, 110, 100, 108, 101, 0, 0, 0, 0,
+				32, 0, 0, 0, 0, 0, 0, 0, 32, 47, 111,
+				115, 99, 105, 108, 108, 97, 116, 111, 114, 47, 52,
+				47, 102, 114, 101, 113, 117, 101, 110, 99, 121, 0,
+				44, 102, 0, 0, 67, 220, 0, 0},
+		},
+	}
+
+	for _, testCase := range testCases {
+
+		actual, remainingBytes, error := BundleFromBytes(testCase.bytes)
+
+		if error != nil {
+			fmt.Println(error)
+			t.Errorf("Test '%s' failed to encode properly", testCase.description)
+		}
+
+		if len(remainingBytes) > 0 {
+			t.Errorf("Test '%s' should not have any remaining bytes", testCase.description)
+		}
+
+		if !reflect.DeepEqual(actual, testCase.expected) {
+			t.Errorf("Test '%s' failed to encode bundle properly", testCase.description)
+			fmt.Printf("expected: %v\n", testCase.expected)
+			fmt.Printf("actual: %v\n", actual)
+		}
+
+	}
+}

cmd/makeosc/makeosc.go

@@ -1,14 +1,14 @@
 package main
 
 import (
+	"context"
 	"encoding/hex"
 	"fmt"
 	"os"
 	"strconv"
 
-	"github.com/hypebeast/go-osc/osc"
-
-	"github.com/spf13/cobra"
+	osc "github.com/jwetzell/osc-go"
+	"github.com/urfave/cli/v3"
 )
 
 func main() {
@@ -17,69 +17,123 @@ func main() {
 	var Types []string
 	var Slip bool
 
-	var rootCmd = &cobra.Command{
-		Use: "sendosc",
-		Run: func(cmd *cobra.Command, args []string) {
+	cmd := &cli.Command{
+		Name:  "makeosc",
+		Usage: "make osc bytes",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:        "address",
+				Value:       "",
+				Usage:       "OSC address",
+				Destination: &Address,
+				Required:    true,
+			},
+			&cli.StringSliceFlag{
+				Name:        "arg",
+				Usage:       "OSC args",
+				Destination: &Args,
+			},
+			&cli.StringSliceFlag{
+				Name:        "type",
+				Usage:       "OSC types",
+				Destination: &Types,
+			},
+			&cli.BoolFlag{
+				Name:        "slip",
+				Value:       false,
+				Usage:       "whether to slip encode the OSC Message bytes",
+				Destination: &Slip,
+			},
+		},
+		Action: func(ctx context.Context, cmd *cli.Command) error {
 			make(Address, Args, Types, Slip)
+			return nil
 		},
 	}
-	rootCmd.Flags().StringVar(&Address, "address", "", "OSC address")
-	rootCmd.Flags().StringArrayVar(&Args, "arg", []string{}, "OSC args")
-	rootCmd.Flags().StringArrayVar(&Types, "type", []string{}, "OSC types")
-	rootCmd.Flags().BoolVar(&Slip, "slip", false, "whether to slip encode the OSC Message bytes")
-	rootCmd.MarkFlagRequired("address")
-	rootCmd.Execute()
+
+	if err := cmd.Run(context.Background(), os.Args); err != nil {
+		panic(err)
+	}
 }
 
-func argToTypedArg(rawArg string, oscType string) any {
+func argToTypedArg(rawArg string, oscType string) osc.OSCArg {
+
 	switch oscType {
 	case "s":
-		return rawArg
+		return osc.OSCArg{
+			Value: rawArg,
+			Type:  "s",
+		}
 	case "i":
 		number, err := strconv.ParseInt(rawArg, 10, 32)
 		if err != nil {
 			// ... handle error
 			panic(err)
 		}
-		return int32(number)
+		return osc.OSCArg{
+			Value: int32(number),
+			Type:  "i",
+		}
 	case "f":
 		number, err := strconv.ParseFloat(rawArg, 32)
 		if err != nil {
 			// ... handle error
 			panic(err)
 		}
-		return float32(number)
+		return osc.OSCArg{
+			Value: float32(number),
+			Type:  "f",
+		}
 	case "b":
 		data, err := hex.DecodeString(rawArg)
 		if err != nil {
 			// ... handle error
 			panic(err)
 		}
-		return data
+		return osc.OSCArg{
+			Value: data,
+			Type:  "b",
+		}
 	case "h":
 		number, err := strconv.ParseInt(rawArg, 10, 64)
 		if err != nil {
 			// ... handle error
 			panic(err)
 		}
-		return int64(number)
+		return osc.OSCArg{
+			Value: int64(number),
+			Type:  "h",
+		}
 	case "d":
 		number, err := strconv.ParseFloat(rawArg, 64)
 		if err != nil {
 			// ... handle error
 			panic(err)
 		}
-		return float64(number)
+		return osc.OSCArg{
+			Value: float64(number),
+			Type:  "d",
+		}
 	case "T":
-		return true
+		return osc.OSCArg{
+			Value: true,
+			Type:  "T",
+		}
 	case "F":
-		return false
+		return osc.OSCArg{
+			Value: false,
+			Type:  "F",
+		}
 	case "N":
-		return nil
+		return osc.OSCArg{
+			Value: nil,
+			Type:  "N",
+		}
 	default:
 		fmt.Print("unhandled osc type: ")
 		fmt.Printf("%s.\n", oscType)
-		return rawArg
+		// TODO(jwetzell): something better than this like actual nil, err thing
+		return osc.OSCArg{}
 	}
 }
 
@@ -89,7 +143,7 @@ func slipEncode(bytes []byte) []byte {
 	ESC_END := byte(0xdc)
 	ESC_ESC := byte(0xdd)
 
-	var encodedBytes = []byte{}
+	var encodedBytes = []byte{END}
 
 	for _, byteToEncode := range bytes {
 		if byteToEncode == END {
@@ -107,7 +161,10 @@ func slipEncode(bytes []byte) []byte {
 
 func make(address string, args []string, types []string, slip bool) {
 
-	oscMessage := osc.NewMessage(address)
+	oscMessage := osc.OSCMessage{
+		Address: address,
+		Args:    []osc.OSCArg{},
+	}
 
 	for index, arg := range args {
 		oscType := "s"
@@ -115,14 +172,10 @@ func make(address string, args []string, types []string, slip bool) {
 			oscType = types[index]
 		}
 
-		oscMessage.Append(argToTypedArg(arg, oscType))
+		oscMessage.Args = append(oscMessage.Args, argToTypedArg(arg, oscType))
 	}
 
-	oscMessageBuffer, err := oscMessage.MarshalBinary()
-
-	if err != nil {
-		panic(err)
-	}
+	oscMessageBuffer := oscMessage.ToBytes()
 
 	if slip {
 		oscMessageBuffer = slipEncode(oscMessageBuffer)

cmd/receiveosc/receiveosc.go

@@ -1,30 +1,181 @@
 package main
 
 import (
+	"context"
+	"encoding/json"
 	"fmt"
 	"net"
+	"os"
 
-	"github.com/chabad360/go-osc/osc"
-	"github.com/spf13/cobra"
+	osc "github.com/jwetzell/osc-go"
+	"github.com/urfave/cli/v3"
 )
 
 func main() {
 	var Host string
-	var Port string
+	var Port int32
+	var Protocol string
+	var Format string
 
-	var rootCmd = &cobra.Command{
-		Use: "sendosc",
-		Run: func(cmd *cobra.Command, args []string) {
-			netAddress := Host + ":" + Port
-			listen(netAddress)
+	cmd := &cli.Command{
+		Name:  "receiveosc",
+		Usage: "receive OSC messages via UDP or TCP",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:        "host",
+				Usage:       "host to send OSC message to",
+				Value:       "127.0.0.1",
+				Destination: &Host,
+			},
+			&cli.Int32Flag{
+				Name:        "port",
+				Usage:       "port to send OSC message to",
+				Destination: &Port,
+				Value:       8888,
+			},
+			&cli.StringFlag{
+				Name:        "protocol",
+				Usage:       "protocol to use to send (tcp or udp)",
+				Value:       "udp",
+				Destination: &Protocol,
+				Validator: func(flag string) error {
+					if flag != "udp" && flag != "tcp" {
+						return fmt.Errorf("protocol must be either 'udp' or 'tcp'")
+					}
+					return nil
+				},
+			},
+			&cli.StringFlag{
+				Name:        "format",
+				Usage:       "format for messages to be output in ('json')",
+				Value:       "json",
+				Destination: &Format,
+				Validator: func(flag string) error {
+					if flag != "json" {
+						return fmt.Errorf("format must be 'json'")
+					}
+					return nil
+				},
+			},
+		},
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			netAddress := fmt.Sprintf("%s:%d", Host, Port)
+			if Protocol == "udp" {
+				listenUDP(netAddress, Format)
+			} else if Protocol == "tcp" {
+				listenTCP(netAddress, Format)
+			}
+			return nil
 		},
 	}
-	rootCmd.Flags().StringVar(&Host, "host", "127.0.0.1", "host to send OSC message to")
-	rootCmd.Flags().StringVar(&Port, "port", "8888", "port to send OSC message to")
-	rootCmd.Execute()
+
+	if err := cmd.Run(context.Background(), os.Args); err != nil {
+		panic(err)
+	}
 }
 
-func listen(netAddress string) {
+func listenTCP(netAddress string, format string) {
+	socket, err := net.Listen("tcp4", netAddress)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	defer socket.Close()
+
+	for {
+		conn, err := socket.Accept()
+		if err != nil {
+			fmt.Println(err)
+			continue
+		}
+		go handleConnection(conn, format)
+	}
+}
+
+type SLIP struct {
+	pendingBytes []byte
+	Messages     chan osc.OSCMessage
+}
+
+func (s *SLIP) decode(bytes []byte) {
+	END := byte(0xc0)
+	ESC := byte(0xdb)
+	ESC_END := byte(0xdc)
+	ESC_ESC := byte(0xdd)
+
+	escapeNext := false
+	for _, packetByte := range bytes {
+
+		if packetByte == ESC {
+			escapeNext = true
+			continue
+		}
+
+		if escapeNext {
+			if packetByte == ESC_END {
+				s.pendingBytes = append(s.pendingBytes, END)
+			} else if packetByte == ESC_ESC {
+				s.pendingBytes = append(s.pendingBytes, ESC)
+			}
+			escapeNext = false
+		} else if packetByte == END {
+			if len(s.pendingBytes) == 0 {
+				// opening END byte, can discard
+				continue
+			} else {
+				message, err := osc.MessageFromBytes(s.pendingBytes)
+				if err != nil {
+					fmt.Println(err)
+				} else {
+					s.Messages <- message
+				}
+			}
+			s.pendingBytes = []byte{}
+		} else {
+			s.pendingBytes = append(s.pendingBytes, packetByte)
+		}
+	}
+
+}
+
+func handleSLIP(slip SLIP, format string) {
+	for message := range slip.Messages {
+		handleMessage(message, format)
+	}
+}
+
+func handleConnection(conn net.Conn, format string) {
+	slip := SLIP{
+		pendingBytes: []byte{},
+		Messages:     make(chan osc.OSCMessage),
+	}
+	go handleSLIP(slip, format)
+
+	defer conn.Close()
+	buffer := make([]byte, 1024)
+
+	for {
+		bytesRead, err := conn.Read(buffer)
+
+		if err != nil {
+			return
+		}
+
+		slip.decode(buffer[0:bytesRead])
+	}
+}
+
+func handleMessage(message osc.OSCMessage, format string) {
+	if format == "json" {
+		jsonData, _ := json.Marshal(message)
+		fmt.Println(string(jsonData))
+	} else {
+		fmt.Printf("%v\n", message)
+	}
+}
+
+func listenUDP(netAddress string, format string) {
 
 	s, err := net.ResolveUDPAddr("udp4", netAddress)
 	if err != nil {
@@ -38,8 +189,6 @@ func listen(netAddress string) {
 		return
 	}
 
-	fmt.Printf("listening on %s (udp)\n", netAddress)
-
 	defer connection.Close()
 	buffer := make([]byte, 1024)
 
@@ -50,11 +199,11 @@ func listen(netAddress string) {
 			panic(err)
 		}
 
-		oscMessage, err := osc.NewMessageFromData(buffer[0:bytesRead])
+		oscMessage, err := osc.MessageFromBytes(buffer[0:bytesRead])
 
 		if err != nil {
 			panic(err)
 		}
-		fmt.Println(oscMessage)
+		handleMessage(oscMessage, format)
 	}
 }

cmd/sendosc/sendosc.go

@@ -1,14 +1,16 @@
 package main
 
 import (
+	"context"
 	"encoding/hex"
 	"fmt"
 	"net"
+	"os"
 	"strconv"
 
-	"github.com/hypebeast/go-osc/osc"
+	osc "github.com/jwetzell/osc-go"
 
-	"github.com/spf13/cobra"
+	"github.com/urfave/cli/v3"
 )
 
 func main() {
@@ -20,74 +22,148 @@ func main() {
 	var Types []string
 	var Slip bool
 
-	var rootCmd = &cobra.Command{
-		Use: "sendosc",
-		Run: func(cmd *cobra.Command, args []string) {
+	cmd := &cli.Command{
+		Name:  "sendosc",
+		Usage: "send OSC messages via UDP or TCP",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:        "host",
+				Usage:       "host to send OSC message to",
+				Destination: &Host,
+				Required:    true,
+			},
+			&cli.Int32Flag{
+				Name:        "port",
+				Usage:       "port to send OSC message to",
+				Destination: &Port,
+				Required:    true,
+			},
+			&cli.StringFlag{
+				Name:        "protocol",
+				Usage:       "protocol to use to send (tcp or udp)",
+				Value:       "udp",
+				Destination: &Protocol,
+				Validator: func(flag string) error {
+					if flag != "udp" && flag != "tcp" {
+						return fmt.Errorf("protocol must be either 'udp' or 'tcp'")
+					}
+					return nil
+				},
+			},
+			&cli.StringFlag{
+				Name:        "address",
+				Usage:       "OSC address",
+				Destination: &Address,
+				Required:    true,
+			},
+			&cli.StringSliceFlag{
+				Name:        "arg",
+				Usage:       "OSC args",
+				Value:       []string{},
+				Destination: &Args,
+			},
+			&cli.StringSliceFlag{
+				Name:        "type",
+				Usage:       "OSC types",
+				Value:       []string{},
+				Destination: &Types,
+			},
+			&cli.BoolFlag{
+				Name:        "slip",
+				Value:       false,
+				Usage:       "whether to slip encode the OSC Message bytes",
+				Destination: &Slip,
+			},
+		},
+		Action: func(ctx context.Context, cmd *cli.Command) error {
 			send(Host, Port, Address, Args, Types, Protocol, Slip)
+			return nil
 		},
 	}
-	rootCmd.Flags().StringVar(&Host, "host", "", "host to send OSC message to")
-	rootCmd.Flags().Int32Var(&Port, "port", 9999, "port to send OSC message to")
-	rootCmd.Flags().StringVar(&Address, "address", "", "OSC address")
-	rootCmd.Flags().StringVar(&Protocol, "protocol", "udp", "protocol to use to send (tcp or udp)")
-	rootCmd.Flags().StringArrayVar(&Args, "arg", []string{}, "OSC args")
-	rootCmd.Flags().StringArrayVar(&Types, "type", []string{}, "OSC types")
-	rootCmd.Flags().BoolVar(&Slip, "slip", false, "whether to slip encode the OSC Message bytes")
-	rootCmd.MarkFlagRequired("host")
-	rootCmd.MarkFlagRequired("port")
-	rootCmd.MarkFlagRequired("address")
-	rootCmd.Execute()
+
+	if err := cmd.Run(context.Background(), os.Args); err != nil {
+		panic(err)
+	}
 }
 
-func argToTypedArg(rawArg string, oscType string) any {
+func argToTypedArg(rawArg string, oscType string) osc.OSCArg {
+
 	switch oscType {
 	case "s":
-		return rawArg
+		return osc.OSCArg{
+			Value: rawArg,
+			Type:  "s",
+		}
 	case "i":
 		number, err := strconv.ParseInt(rawArg, 10, 32)
 		if err != nil {
 			// ... handle error
 			panic(err)
 		}
-		return int32(number)
+		return osc.OSCArg{
+			Value: int32(number),
+			Type:  "i",
+		}
 	case "f":
 		number, err := strconv.ParseFloat(rawArg, 32)
 		if err != nil {
 			// ... handle error
 			panic(err)
 		}
-		return float32(number)
+		return osc.OSCArg{
+			Value: float32(number),
+			Type:  "f",
+		}
 	case "b":
 		data, err := hex.DecodeString(rawArg)
 		if err != nil {
 			// ... handle error
 			panic(err)
 		}
-		return data
+		return osc.OSCArg{
+			Value: data,
+			Type:  "b",
+		}
 	case "h":
 		number, err := strconv.ParseInt(rawArg, 10, 64)
 		if err != nil {
 			// ... handle error
 			panic(err)
 		}
-		return int64(number)
+		return osc.OSCArg{
+			Value: int64(number),
+			Type:  "h",
+		}
 	case "d":
 		number, err := strconv.ParseFloat(rawArg, 64)
 		if err != nil {
 			// ... handle error
 			panic(err)
 		}
-		return float64(number)
+		return osc.OSCArg{
+			Value: float64(number),
+			Type:  "d",
+		}
 	case "T":
-		return true
+		return osc.OSCArg{
+			Value: true,
+			Type:  "T",
+		}
 	case "F":
-		return false
+		return osc.OSCArg{
+			Value: false,
+			Type:  "F",
+		}
 	case "N":
-		return nil
+		return osc.OSCArg{
+			Value: nil,
+			Type:  "N",
+		}
 	default:
 		fmt.Print("unhandled osc type: ")
 		fmt.Printf("%s.\n", oscType)
-		return rawArg
+		// TODO(jwetzell): something better than this like actual nil, err thing
+		return osc.OSCArg{}
 	}
 }
 
@@ -97,7 +173,7 @@ func slipEncode(bytes []byte) []byte {
 	ESC_END := byte(0xdc)
 	ESC_ESC := byte(0xdd)
 
-	var encodedBytes = []byte{}
+	var encodedBytes = []byte{END}
 
 	for _, byteToEncode := range bytes {
 		if byteToEncode == END {
@@ -115,22 +191,23 @@ func slipEncode(bytes []byte) []byte {
 
 func send(host string, port int32, address string, args []string, types []string, protocol string, slip bool) {
 
-	oscMessage := osc.NewMessage(address)
+	oscMessage := osc.OSCMessage{
+		Address: address,
+		Args:    []osc.OSCArg{},
+	}
 
 	for index, arg := range args {
 		oscType := "s"
 		if len(types) > index {
 			oscType = types[index]
 		}
+		arg := argToTypedArg(arg, oscType)
+
+		oscMessage.Args = append(oscMessage.Args, arg)
 
-		oscMessage.Append(argToTypedArg(arg, oscType))
 	}
 
-	oscMessageBuffer, err := oscMessage.MarshalBinary()
-
-	if err != nil {
-		panic(err)
-	}
+	oscMessageBuffer := oscMessage.ToBytes()
 
 	if slip {
 		oscMessageBuffer = slipEncode(oscMessageBuffer)

go.mod

@@ -1,14 +1,5 @@
 module github.com/jwetzell/osc-go
 
-go 1.23.1
+go 1.25.1
 
-require (
-	github.com/chabad360/go-osc v0.0.0-20220502185613-216f362cdf0a
-	github.com/hypebeast/go-osc v0.0.0-20220308234300-cec5a8a1e5f5
-	github.com/spf13/cobra v1.8.1
-)
-
-require (
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-)
+require github.com/urfave/cli/v3 v3.4.1

go.sum

@@ -1,14 +1,10 @@
-github.com/chabad360/go-osc v0.0.0-20220502185613-216f362cdf0a h1:MTor/GgULww+hISVbeiNuC5vyT1mc2xa6/14ib0lvyc=
-github.com/chabad360/go-osc v0.0.0-20220502185613-216f362cdf0a/go.mod h1:/aAn5LNn+s7zq33XItIcYLr6aOntVkWckHPAG40yeUc=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/hypebeast/go-osc v0.0.0-20220308234300-cec5a8a1e5f5 h1:fqwINudmUrvGCuw+e3tedZ2UJ0hklSw6t8UPomctKyQ=
-github.com/hypebeast/go-osc v0.0.0-20220308234300-cec5a8a1e5f5/go.mod h1:lqMjoCs0y0GoRRujSPZRBaGb4c5ER6TfkFKSClxkMbY=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/urfave/cli/v3 v3.4.1 h1:1M9UOCy5bLmGnuu1yn3t3CB4rG79Rtoxuv1sPhnm6qM=
+github.com/urfave/cli/v3 v3.4.1/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

message.go

@@ -0,0 +1,58 @@
+package osc
+
+import (
+	"errors"
+	"strings"
+)
+
+func (m *OSCMessage) ToBytes() []byte {
+	//TODO(jwetzell): add error handling
+	oscBuffer := []byte{}
+
+	oscBuffer = append(oscBuffer, stringToOSCBytes(m.Address)...)
+
+	var sb strings.Builder
+
+	sb.WriteString(",")
+
+	for _, arg := range m.Args {
+		sb.WriteString(arg.Type)
+	}
+
+	oscBuffer = append(oscBuffer, stringToOSCBytes(sb.String())...)
+	oscBuffer = append(oscBuffer, argsToBuffer(m.Args)...)
+
+	return oscBuffer
+}
+
+func MessageFromBytes(bytes []byte) (OSCMessage, error) {
+	address, typeAndArgBytes := readOSCString(bytes)
+
+	if address[0] != 47 {
+		return OSCMessage{}, errors.New("OSC Message address must start with /")
+	}
+
+	oscMessage := OSCMessage{
+		Address: address,
+		Args:    []OSCArg{},
+	}
+
+	typeString, argBytes := readOSCString(typeAndArgBytes)
+
+	for index, oscType := range typeString {
+		if index == 0 {
+			if oscType != ',' {
+				return OSCMessage{}, errors.New("type string is malformed")
+			}
+		} else {
+			oscArg, remainingBytes, error := readOSCArg(argBytes, string(oscType))
+			if error != nil {
+				return oscMessage, error
+			}
+			argBytes = remainingBytes
+			oscMessage.Args = append(oscMessage.Args, oscArg)
+		}
+	}
+
+	return oscMessage, nil
+}

message_test.go

@@ -0,0 +1,285 @@
+package osc
+
+import (
+	"fmt"
+	"math"
+	"reflect"
+	"testing"
+)
+
+func TestOSCMessageEncoding(t *testing.T) {
+
+	testCases := []struct {
+		description string
+		message     OSCMessage
+		expected    []byte
+	}{
+		{
+			"simple hello",
+			OSCMessage{
+				Address: "/hello",
+				Args:    []OSCArg{},
+			},
+			[]byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 0, 0, 0},
+		},
+		{
+			"simple address string arg",
+			OSCMessage{
+				Address: "/hello",
+				Args: []OSCArg{
+					{
+						Type:  "s",
+						Value: "arg1",
+					},
+				},
+			},
+			[]byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 115, 0, 0, 97, 114, 103, 49, 0, 0, 0, 0},
+		},
+		{
+			description: "simple address integer arg",
+			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "i", Value: 35}}},
+			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 105, 0, 0, 0, 0, 0, 35},
+		},
+		{
+			description: "simple address float arg",
+			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "f", Value: 34.5}}},
+			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 102, 0, 0, 66, 10, 0, 0},
+		},
+		{
+			description: "simple address blob arg",
+			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "b", Value: []byte{98, 108, 111, 98}}}},
+			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 98, 0, 0, 0, 0, 0, 4, 98, 108, 111, 98},
+		},
+		{
+			description: "simple address True arg",
+			message:     OSCMessage{Address: "/hello", Args: []OSCArg{OSCArg{Type: "T", Value: true}}},
+			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 84, 0, 0},
+		},
+		{
+			description: "simple address False arg",
+			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "F", Value: false}}},
+			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 70, 0, 0},
+		},
+		{
+			description: "simple address color arg",
+			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "r", Value: OSCColor{r: 20, g: 21, b: 22, a: 10}}}},
+			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 114, 0, 0, 20, 21, 22, 10},
+		},
+		{
+			description: "simple address nil arg",
+			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "N", Value: nil}}},
+			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 78, 0, 0},
+		},
+		{
+			description: "simple address int64 arg",
+			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "h", Value: 281474976710655}}},
+			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 104, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255},
+		},
+		{
+			description: "simple address float64 arg",
+			message:     OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "d", Value: 12.7654763}}},
+			expected: []byte{
+				47, 104, 101, 108, 108, 111, 0, 0, 44, 100, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9, 0xe6,
+			},
+		},
+		// TODO(jwetzell): get array args working working
+		// {
+		// 	description: "simple address array arg",
+		// 	message: OSCMessage{
+		// 		Address: "/hello",
+		// 		Args: []OSCArg{
+		// 			[]OSCArg{
+		//				{Type: "d", Value: 12.7654763},
+		// 				{Type: "i", Value: 1000},
+		//			},
+		// 		},
+		// 	},
+		// 	expected: []byte{
+		// 		47, 104, 101, 108, 108, 111, 0, 0, 44, 91, 100, 105, 93, 0, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9, 0xe6,
+		// 		0, 0, 3, 232,
+		// 	},
+		// },
+		{
+			description: "osc 1.0 spec example 1",
+			message:     OSCMessage{Address: "/oscillator/4/frequency", Args: []OSCArg{{Type: "f", Value: 440}}},
+			expected: []byte{
+				47, 111, 115, 99, 105, 108, 108, 97, 116, 111, 114, 47, 52, 47, 102, 114, 101, 113, 117, 101, 110, 99, 121, 0, 44,
+				102, 0, 0, 67, 220, 0, 0,
+			},
+		},
+		{
+			description: "osc 1.0 spec example 2",
+			message: OSCMessage{
+				Address: "/foo",
+				Args: []OSCArg{
+					{Type: "i", Value: 1000},
+					{Type: "i", Value: -1},
+					{Type: "s", Value: "hello"},
+					// thanks IEEE 754
+					{Type: "f", Value: 1.2339999675750732421875},
+					{Type: "f", Value: 5.677999973297119140625},
+				},
+			},
+			expected: []byte{
+				47, 102, 111, 111, 0, 0, 0, 0, 44, 105, 105, 115, 102, 102, 0, 0, 0, 0, 3, 232, 255, 255, 255, 255, 104, 101, 108,
+				108, 111, 0, 0, 0, 63, 157, 243, 182, 64, 181, 178, 45,
+			},
+		},
+	}
+
+	for _, testCase := range testCases {
+
+		actual := testCase.message.ToBytes()
+
+		if !reflect.DeepEqual(actual, testCase.expected) {
+			t.Errorf("Test '%s' failed to encode properly", testCase.description)
+			fmt.Printf("expected: %v\n", testCase.expected)
+			fmt.Printf("actual: %v\n", actual)
+		}
+	}
+
+}
+
+func TestOSCMessageDecoding(t *testing.T) {
+	testCases := []struct {
+		description string
+		bytes       []byte
+		expected    OSCMessage
+	}{
+		{
+			description: "simple address no args",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 0, 0, 0},
+			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{}},
+		},
+		{
+			description: "simple address string arg",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 115, 0, 0, 97, 114, 103, 49, 0, 0, 0, 0},
+			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "s", Value: "arg1"}}},
+		},
+		{
+			description: "simple address integer arg",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 105, 0, 0, 0, 0, 0, 35},
+			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "i", Value: int32(35)}}},
+		},
+		{
+			description: "simple address float arg",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 102, 0, 0, 66, 10, 0, 0},
+			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "f", Value: float32(34.5)}}},
+		},
+		{
+			description: "simple address blob arg",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 98, 0, 0, 0, 0, 0, 4, 98, 108, 111, 98},
+			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "b", Value: []byte{98, 108, 111, 98}}}},
+		},
+		{
+			description: "simple address True arg",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 84, 0, 0},
+			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "T", Value: true}}},
+		},
+		{
+			description: "simple address False arg",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 70, 0, 0},
+			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "F", Value: false}}},
+		},
+		{
+			description: "simple address color arg",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 114, 0, 0, 20, 21, 22, 10},
+			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "r", Value: OSCColor{r: 20, g: 21, b: 22, a: 10}}}},
+		},
+		{
+			description: "simple address nil arg",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 78, 0, 0},
+			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "N", Value: nil}}},
+		},
+		{
+			description: "simple address Inifinitum arg",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 73, 0, 0},
+			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "I", Value: math.MaxInt32}}},
+		},
+		{
+			description: "simple address int64 arg",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 104, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255},
+			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "h", Value: int64(281474976710655)}}},
+		},
+		{
+			description: "simple address float64 arg",
+			bytes: []byte{
+				47, 104, 101, 108, 108, 111, 0, 0, 44, 100, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9, 0xe6,
+			},
+			expected: OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "d", Value: float64(12.7654763)}}},
+		},
+		// TODO(jwetzell): support OSC array
+		// {
+		// 	description: "simple address array arg",
+		// 	bytes: []byte{
+		// 		47, 104, 101, 108, 108, 111, 0, 0, 44, 91, 100, 105, 93, 0, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9, 0xe6,
+		// 		0, 0, 3, 232,
+		// 	},
+		// 	expected: OSCMessage{
+		// 		Address: "/hello",
+		// 		Args: []OSCArg{
+		// 			[]OSCArg{
+		// 				{Type: "d", Value: 12.7654763},
+		// 				{Type: "i", Value: 1000},
+		// 			},
+		// 		},
+		// 	},
+		// },
+		{
+			description: "simple address no type string",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0},
+			expected: OSCMessage{
+				Address: "/hello",
+				Args:    []OSCArg{},
+			},
+		},
+		{
+			description: "osc 1.0 spec example 1",
+			bytes: []byte{
+				47, 111, 115, 99, 105, 108, 108, 97, 116, 111, 114, 47, 52, 47, 102, 114, 101, 113, 117, 101, 110, 99, 121, 0, 44,
+				102, 0, 0, 67, 220, 0, 0,
+			},
+			expected: OSCMessage{Address: "/oscillator/4/frequency", Args: []OSCArg{{Type: "f", Value: float32(440)}}},
+		},
+		{
+			description: "osc 1.0 spec example 2",
+			bytes: []byte{
+				47, 102, 111, 111, 0, 0, 0, 0, 44, 105, 105, 115, 102, 102, 0, 0, 0, 0, 3, 232, 255, 255, 255, 255, 104, 101, 108,
+				108, 111, 0, 0, 0, 63, 157, 243, 182, 64, 181, 178, 45,
+			},
+			expected: OSCMessage{
+				Address: "/foo",
+				Args: []OSCArg{
+					{Type: "i", Value: int32(1000)},
+					{Type: "i", Value: int32(-1)},
+					{Type: "s", Value: "hello"},
+					// thanks IEEE 754
+					{Type: "f", Value: float32(1.2339999675750732421875)},
+					{Type: "f", Value: float32(5.677999973297119140625)},
+				},
+			},
+		},
+	}
+
+	for _, testCase := range testCases {
+
+		actual, error := MessageFromBytes(testCase.bytes)
+
+		if error != nil {
+			fmt.Println(error)
+			t.Errorf("Test '%s' failed to encode properly", testCase.description)
+		}
+
+		if !reflect.DeepEqual(actual.Address, testCase.expected.Address) {
+			t.Errorf("Test '%s' failed to encode address properly", testCase.description)
+			fmt.Printf("expected: %v\n", testCase.expected.Address)
+			fmt.Printf("actual: %v\n", actual.Address)
+		}
+
+		if !reflect.DeepEqual(actual.Args, testCase.expected.Args) {
+			t.Errorf("Test '%s' failed to encode args properly", testCase.description)
+			fmt.Printf("expected: %v\n", testCase.expected.Args)
+			fmt.Printf("actual: %v\n", actual.Args)
+		}
+	}
+}

osc.go

@@ -0,0 +1,356 @@
+package osc
+
+// TODO(jwetzell): split things up
+import (
+	"bytes"
+	"encoding/binary"
+	"errors"
+	"fmt"
+	"math"
+	"strings"
+)
+
+func stringToOSCBytes(rawString string) []byte {
+	var sb strings.Builder
+
+	sb.WriteString(rawString)
+	sb.WriteString("\u0000")
+
+	padLength := 4 - (len(sb.String()) % 4)
+	if padLength < 4 {
+		for i := 0; i < padLength; i++ {
+			sb.WriteString("\u0000")
+		}
+	}
+
+	return []byte(sb.String())
+}
+
+func int32ToOSCBytes(number int32) []byte {
+	var buf bytes.Buffer
+	err := binary.Write(&buf, binary.BigEndian, number)
+	if err != nil {
+		panic(err)
+	}
+	return buf.Bytes()
+}
+
+func int64ToOSCBytes(number int64) []byte {
+	var buf bytes.Buffer
+	err := binary.Write(&buf, binary.BigEndian, number)
+	if err != nil {
+		panic(err)
+	}
+	return buf.Bytes()
+}
+
+func float32ToOSCBytes(number float32) []byte {
+	var buf bytes.Buffer
+	err := binary.Write(&buf, binary.BigEndian, number)
+	if err != nil {
+		panic(err)
+	}
+	return buf.Bytes()
+}
+
+func float64ToOSCBytes(number float64) []byte {
+	var buf bytes.Buffer
+	err := binary.Write(&buf, binary.BigEndian, number)
+	if err != nil {
+		panic(err)
+	}
+	return buf.Bytes()
+}
+
+func byteArrayToOSCBytes(bytes []byte) []byte {
+	oscBytes := []byte{}
+
+	bytesSize := len(bytes)
+	oscBytes = append(oscBytes, int32ToOSCBytes(int32(bytesSize))...)
+	oscBytes = append(oscBytes, bytes...)
+
+	padLength := 4 - (bytesSize % 4)
+	if padLength < 4 {
+		for i := 0; i < padLength; i++ {
+			oscBytes = append(oscBytes, 0)
+		}
+	}
+
+	return oscBytes
+}
+
+func timeTagToOSCBytes(timeTag OSCTimeTag) []byte {
+	timeTagBytes := int32ToOSCBytes(timeTag.seconds)
+	timeTagBytes = append(timeTagBytes, int32ToOSCBytes(timeTag.fractionalSeconds)...)
+
+	return timeTagBytes
+}
+
+func argsToBuffer(args []OSCArg) []byte {
+	//TODO(jwetzell): add error handling
+	var argBuffers = []byte{}
+
+	for _, arg := range args {
+		switch oscType := arg.Type; oscType {
+		case "s":
+			if value, ok := arg.Value.(string); ok {
+				argBuffers = append(argBuffers, stringToOSCBytes(value)...)
+			} else {
+				fmt.Println("OSC arg had string type but non-string value.")
+			}
+		case "i":
+			if value, ok := arg.Value.(int); ok {
+				argBuffers = append(argBuffers, int32ToOSCBytes(int32(value))...)
+			} else if value, ok := arg.Value.(int32); ok {
+				argBuffers = append(argBuffers, int32ToOSCBytes(value)...)
+			} else {
+				fmt.Println("OSC arg had integer type but non-integer value.")
+			}
+		case "f":
+			if value, ok := arg.Value.(float32); ok {
+				argBuffers = append(argBuffers, float32ToOSCBytes(float32(value))...)
+			} else if value, ok := arg.Value.(float64); ok {
+				argBuffers = append(argBuffers, float32ToOSCBytes(float32(value))...)
+			} else if value, ok := arg.Value.(int); ok {
+				argBuffers = append(argBuffers, float32ToOSCBytes(float32(value))...)
+			} else if value, ok := arg.Value.(int32); ok {
+				argBuffers = append(argBuffers, float32ToOSCBytes(float32(value))...)
+			} else if value, ok := arg.Value.(int64); ok {
+				argBuffers = append(argBuffers, float32ToOSCBytes(float32(value))...)
+			} else {
+				fmt.Println("OSC arg had float type but non-float value.")
+			}
+		case "b":
+			if value, ok := arg.Value.([]byte); ok {
+				argBuffers = append(argBuffers, byteArrayToOSCBytes(value)...)
+			} else {
+				fmt.Println("OSC arg had blob type but non-blob value.")
+			}
+		case "T":
+			argBuffers = append(argBuffers, make([]byte, 0)...)
+		case "F":
+			argBuffers = append(argBuffers, make([]byte, 0)...)
+		case "N":
+			argBuffers = append(argBuffers, make([]byte, 0)...)
+		case "I":
+			argBuffers = append(argBuffers, make([]byte, 0)...)
+		case "r":
+			color, ok := arg.Value.(OSCColor)
+			if ok {
+				colorBytes := []byte{color.r, color.g, color.b, color.a}
+				argBuffers = append(argBuffers, colorBytes...)
+			}
+		case "h":
+			if value, ok := arg.Value.(int); ok {
+				argBuffers = append(argBuffers, int64ToOSCBytes(int64(value))...)
+			} else if value, ok := arg.Value.(int32); ok {
+				argBuffers = append(argBuffers, int64ToOSCBytes(int64(value))...)
+			} else if value, ok := arg.Value.(int64); ok {
+				argBuffers = append(argBuffers, int64ToOSCBytes(value)...)
+			} else {
+				fmt.Println("OSC arg had integer type but non-integer value.")
+			}
+		case "d":
+			if value, ok := arg.Value.(float32); ok {
+				argBuffers = append(argBuffers, float64ToOSCBytes(float64(value))...)
+			} else if value, ok := arg.Value.(float64); ok {
+				argBuffers = append(argBuffers, float64ToOSCBytes(float64(value))...)
+			} else if value, ok := arg.Value.(int); ok {
+				argBuffers = append(argBuffers, float64ToOSCBytes(float64(value))...)
+			} else if value, ok := arg.Value.(int32); ok {
+				argBuffers = append(argBuffers, float64ToOSCBytes(float64(value))...)
+			} else if value, ok := arg.Value.(int64); ok {
+				argBuffers = append(argBuffers, float64ToOSCBytes(float64(value))...)
+			} else {
+				fmt.Println("OSC arg had float type but non-float value.")
+			}
+		default:
+			fmt.Printf("unhandled osc type: %s.\n", oscType)
+		}
+	}
+	return argBuffers
+}
+
+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
+			}
+		}
+	}
+
+	stringPadding := 4 - (stringEndIndex % 4)
+
+	if stringPadding < 4 {
+		stringEndIndex = stringEndIndex + stringPadding
+	}
+
+	remainingBytes = bytes[stringEndIndex:]
+
+	return oscString, remainingBytes
+}
+
+func readOSCInt32(bytes []byte) (int32, []byte, error) {
+	if len(bytes) < 4 {
+		return 0, bytes, errors.New("int data must be at least 4 bytes large")
+	}
+	bits := binary.BigEndian.Uint32(bytes[0:4])
+	return int32(bits), bytes[4:], nil
+}
+
+func readOSCInt64(bytes []byte) (int64, []byte, error) {
+	if len(bytes) < 8 {
+		return 0, bytes, errors.New("int data must be at least 4 bytes large")
+	}
+	bits := binary.BigEndian.Uint64(bytes[0:8])
+	return int64(bits), bytes[8:], nil
+}
+
+func readOSCFloat32(bytes []byte) (float32, []byte, error) {
+	if len(bytes) < 4 {
+		return 0, bytes, errors.New("float data must be at least 4 bytes large")
+	}
+	bits := binary.BigEndian.Uint32(bytes[0:4])
+	return math.Float32frombits(bits), bytes[4:], nil
+}
+
+func readOSCFloat64(bytes []byte) (float64, []byte, error) {
+	if len(bytes) < 4 {
+		return 0, bytes, errors.New("float data must be at least 4 bytes large")
+	}
+	bits := binary.BigEndian.Uint64(bytes[0:8])
+	return math.Float64frombits(bits), bytes[8:], nil
+}
+
+func readOSCBlob(bytes []byte) ([]byte, []byte, error) {
+	blobLength, remainingBytes, err := readOSCInt32(bytes)
+
+	if err != nil {
+		return []byte{}, bytes, errors.New("problem reading blob data size")
+	}
+
+	if len(remainingBytes) < int(blobLength) {
+		return []byte{}, bytes, errors.New("blob data specified a size larger than the remaining message data")
+	}
+
+	blobLengthPadding := 4 - (blobLength % 4)
+	blobEnd := 4 + blobLength
+
+	if blobLengthPadding < 4 {
+		blobEnd = blobEnd + blobLengthPadding
+	}
+	return bytes[4 : 4+blobLength], bytes[blobEnd:], nil
+}
+
+func readOSCColor(bytes []byte) (OSCColor, []byte, error) {
+	if len(bytes) < 4 {
+		return OSCColor{0, 0, 0, 0}, bytes, errors.New("color data must be at least 4 bytes large")
+	}
+	oscColor := OSCColor{
+		r: bytes[0],
+		g: bytes[1],
+		b: bytes[2],
+		a: bytes[3],
+	}
+	return oscColor, bytes[4:], nil
+}
+func readOSCTimeTag(bytes []byte) (OSCTimeTag, []byte, error) {
+	seconds, bytesAfterSeconds, err := readOSCInt32(bytes)
+	if err != nil {
+		return OSCTimeTag{}, bytes, err
+	}
+	fractionalSeconds, remainingBytes, err := readOSCInt32(bytesAfterSeconds)
+	if err != nil {
+		return OSCTimeTag{}, bytes, err
+	}
+
+	return OSCTimeTag{
+			seconds:           seconds,
+			fractionalSeconds: fractionalSeconds,
+		},
+		remainingBytes,
+		nil
+}
+
+func readOSCArg(bytes []byte, oscType string) (OSCArg, []byte, error) {
+	var readArgError error
+
+	oscArg := OSCArg{}
+	oscArg.Type = oscType
+
+	remainingBytes := []byte{}
+	//TODO(jwetzell): add error handling
+	switch oscType {
+	case "s":
+		argString, bytesLeft := readOSCString(bytes)
+		oscArg.Value = argString
+		remainingBytes = bytesLeft
+	case "i":
+		argInt, bytesLeft, error := readOSCInt32(bytes)
+		if error != nil {
+			readArgError = error
+		}
+		oscArg.Value = argInt
+		remainingBytes = bytesLeft
+	case "f":
+		argFloat, bytesLeft, error := readOSCFloat32(bytes)
+		if error != nil {
+			readArgError = error
+		}
+		oscArg.Value = argFloat
+		remainingBytes = bytesLeft
+	case "b":
+		argBytes, bytesLeft, error := readOSCBlob(bytes)
+		if error != nil {
+			readArgError = error
+		}
+		oscArg.Value = argBytes
+		remainingBytes = bytesLeft
+	case "T":
+		oscArg.Value = true
+		remainingBytes = bytes
+	case "F":
+		oscArg.Value = false
+		remainingBytes = bytes
+	case "N":
+		oscArg.Value = nil
+		remainingBytes = bytes
+	case "I":
+		oscArg.Value = math.MaxInt32
+		remainingBytes = bytes
+	case "r":
+		argColor, bytesLeft, error := readOSCColor(bytes)
+		if error != nil {
+			readArgError = error
+		}
+		oscArg.Value = argColor
+		remainingBytes = bytesLeft
+	case "h":
+		argInt, bytesLeft, error := readOSCInt64(bytes)
+		if error != nil {
+			readArgError = error
+		}
+		oscArg.Value = argInt
+		remainingBytes = bytesLeft
+	case "d":
+		argFloat, bytesLeft, error := readOSCFloat64(bytes)
+		if error != nil {
+			readArgError = error
+		}
+		oscArg.Value = argFloat
+		remainingBytes = bytesLeft
+	default:
+		fmt.Printf("unsupported osc type: %s\n", oscType)
+		readArgError = errors.New("unsupported osc type: " + oscType)
+	}
+	return oscArg, remainingBytes, readArgError
+}

types.go

@@ -0,0 +1,32 @@
+package osc
+
+type OSCPacket interface {
+	ToBytes() []byte
+}
+
+type OSCBundle struct {
+	Contents []OSCPacket `json:"contents"`
+	TimeTag  OSCTimeTag  `json:"timeTag"`
+}
+
+type OSCArg struct {
+	Value any    `json:"value"`
+	Type  string `json:"type"`
+}
+
+type OSCMessage struct {
+	Address string   `json:"address"`
+	Args    []OSCArg `json:"args"`
+}
+
+type OSCColor struct {
+	r uint8
+	g uint8
+	b uint8
+	a uint8
+}
+
+type OSCTimeTag struct {
+	seconds           int32
+	fractionalSeconds int32
+}